From 71178478163dc26bd5a27d297a65744af389bf57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 20 Apr 2016 02:26:56 +0200 Subject: [PATCH] tests: fix int.dom0_update Environment must be preserved for QUBES_XML_PATH variable used to point to a secondary (test) qubes.xml. --- qubes/tests/int/dom0_update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qubes/tests/int/dom0_update.py b/qubes/tests/int/dom0_update.py index 13dc7bc8..d14fcfed 100644 --- a/qubes/tests/int/dom0_update.py +++ b/qubes/tests/int/dom0_update.py @@ -226,7 +226,7 @@ Test package logpath = os.path.join(self.tmpdir, 'dom0-update-output.txt') try: - subprocess.check_call(['sudo', 'qubes-dom0-update', '-y'] + + subprocess.check_call(['sudo', '-E', 'qubes-dom0-update', '-y'] + self.dom0_update_common_opts, stdout=open(logpath, 'w'), stderr=subprocess.STDOUT) @@ -256,7 +256,7 @@ Test package shutil.rmtree('/var/lib/qubes/updates/repodata') logpath = os.path.join(self.tmpdir, 'dom0-update-output.txt') try: - subprocess.check_call(['sudo', 'qubes-dom0-update', '-y', + subprocess.check_call(['sudo', '-E', 'qubes-dom0-update', '-y', '--clean'] + self.dom0_update_common_opts, stdout=open(logpath, 'w'),