Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: QubesOS/qubes-core-admin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e01beb9a3e2219f7e407c1d97c14d289925c8ed2
Choose a base ref
..
head repository: QubesOS/qubes-core-admin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58871e896520b89984cbb123ecc0cbc4c84d6c4a
Choose a head ref
Showing with 6 additions and 5 deletions.
  1. +6 −5 qubes/tests/integ/salt.py
11 changes: 6 additions & 5 deletions qubes/tests/integ/salt.py
View file
Original file line number Diff line number Diff line change
@@ -317,11 +317,12 @@ def setUp(self):
# it being a target
mgmt_tpl = os.environ.get("QUBES_TEST_MGMT_TPL")
if not mgmt_tpl:
self.skipTest("minimal template not supported by this test, "
"set QUBES_TEST_MGMT_TPL env variable to use "
"different template for mgmt vm")
else:
mgmt_tpl = self.app.domains[mgmt_tpl]
mgmt_tpl = str(self.host_app.default_template)
print(f"Using {mgmt_tpl} template for mgmt vm when testing "
f"minimal template as target. You can set "
f"QUBES_TEST_MGMT_TPL env variable to use "
f"different template for mgmt vm")
mgmt_tpl = self.app.domains[mgmt_tpl]


dispvm_tpl_name = self.make_vm_name("disp-tpl")