Fixes to salt tests #493
Fixes to salt tests #493
Conversation
qubes/tests/integ/salt.py
Outdated
| state_output_json = json.loads(state_output[len(expected_output):]) | ||
| json_data = state_output[len(expected_output):] | ||
| # workaround for https://github.com/saltstack/salt/issues/60476 | ||
| # (fixed upstream, but haven't flowd into Fedora yet) |
There was a problem hiding this comment.
| # (fixed upstream, but haven't flowd into Fedora yet) | |
| # (fixed upstream, but hasen't flowed into Fedora yet) |
qubes/tests/integ/salt.py
Outdated
| @@ -399,10 +411,17 @@ def test_001_multi_state_highstate(self): | |||
| expected_output = vmname + ':\n' | |||
| self.assertTrue(state_output.startswith(expected_output), | |||
| 'Full output: ' + state_output) | |||
| json_data = state_output[len(expected_output):] | |||
| # workaround for https://github.com/saltstack/salt/issues/60476 | |||
| # (fixed upstream, but haven't flowd into Fedora yet) | |||
There was a problem hiding this comment.
| # (fixed upstream, but haven't flowd into Fedora yet) | |
| # (fixed upstream, but hasen't flowed into Fedora yet) |
qubes/tests/integ/salt.py
Outdated
| @@ -469,6 +488,12 @@ def test_002_grans_id(self): | |||
| tpl_output = tpl_output[len(tplname + ':\n'):] | |||
|
|
|||
| for name, output in ((tplname, tpl_output), (vmname, appvm_output)): | |||
| # workaround for https://github.com/saltstack/salt/issues/60476 | |||
| # (fixed upstream, but haven't flowd into Fedora yet) | |||
There was a problem hiding this comment.
| # (fixed upstream, but haven't flowd into Fedora yet) | |
| # (fixed upstream, but hasen't flowed into Fedora yet) |
OpenQA test summaryComplete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.1&build=2022111223-4.1&flavor=pull-requests New failures, excluding unstableCompared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.1&build=2022101806-4.1&flavor=update
Failed tests18 failures
Fixed failuresCompared to: https://openqa.qubes-os.org/tests/48243#dependencies 8 fixed
Unstable tests
|
Workaround for saltstack/salt#60476 It prints warning to stdout(?!). The issue is fixed upstream already, but the fix isn't packaged yet. At this time, it affects Fedora 37 only. Fixes QubesOS/qubes-issues#7834
Unset also 'management_dispvm' property as part of breaking dependency loops.
Default test env is now a copy of the host env.
Instead of requiring manually decorating test method, do that automatically when QUBES_TEST_WAIT_ON_FAIL=1 env variable is set.
Codecov Report
@@ Coverage Diff @@
## master #493 +/- ##
=======================================
Coverage 65.83% 65.83%
=======================================
Files 53 53
Lines 10020 10020
=======================================
Hits 6597 6597
Misses 3423 3423
Flags with carried forward coverage won't be shown. Click here to find out more. Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Workaround for a warning message (fixed upstream already, but waiting to be backported)
Fixes QubesOS/qubes-issues#7834