From 8f57ed9b9ed3e4dcb348487b29c18d2772147e07 Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Fri, 12 Jun 2020 10:37:20 +0200 Subject: [PATCH] Stop bringing the test environment into the mocks Change-Id: I1780f186cf107242cacd6d3da7a5bc81a330b536 Closes-Bug: #1883224 --- .../package-installs/tests/test_package_squash.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/diskimage_builder/elements/package-installs/tests/test_package_squash.py b/diskimage_builder/elements/package-installs/tests/test_package_squash.py index fa0915c7..df39ea24 100644 --- a/diskimage_builder/elements/package-installs/tests/test_package_squash.py +++ b/diskimage_builder/elements/package-installs/tests/test_package_squash.py @@ -73,7 +73,7 @@ class TestPackageInstall(base.BaseTestCase): self.assertThat(result, IsMatchingInstallList(expected)) - @mock.patch.object(os, 'environ', dict(ARCH='arm64', **os.environ)) + @mock.patch.object(os, 'environ', dict(ARCH='arm64')) def test_arch(self): '''Exercise the arch and not-arch flags''' objs = { @@ -125,8 +125,7 @@ class TestPackageInstall(base.BaseTestCase): with mock.patch.object(os, 'environ', dict(ARCH=arch, DIB_UBUNTU_KERNEL='linux-image-generic', - DIB_RELEASE=release, - **os.environ)): + DIB_RELEASE=release)): result = installs_squash.collect_data( self.final_dict, self.kernel_objs, 'test_element') @@ -192,8 +191,7 @@ class TestPackageInstall(base.BaseTestCase): dict( DIB_A_FEATURE='1', DIB_B_FEATURE='1', - DIB_C_FEATURE='1', - **os.environ)) + DIB_C_FEATURE='1')) def test_skip_when_list(self): '''Exercise the when flag with lists''' objs = {