diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-05-11 20:21:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-11 20:21:39 +0200 |
| commit | d529fd96c6a2033bdacd1fd7552014a4659ebe44 (patch) | |
| tree | f0107a1a59fb41b158466471b96bd4915e098c69 | |
| parent | 7cf4d14610a021d13e1a54df05cf1bffc03f714b (diff) | |
| parent | ba7da49727661a1b502844eca1445016353ffb92 (diff) | |
| download | vyos-1x-d529fd96c6a2033bdacd1fd7552014a4659ebe44.tar.gz vyos-1x-d529fd96c6a2033bdacd1fd7552014a4659ebe44.zip | |
Merge pull request #5188 from c-po/smoketest-teardown
smoketests: T8845: missing base-class call to commit() in tearDownClass()
| -rw-r--r-- | smoketest/scripts/cli/base_vyostest_shim.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/smoketest/scripts/cli/base_vyostest_shim.py b/smoketest/scripts/cli/base_vyostest_shim.py index 502be2813..590670a06 100644 --- a/smoketest/scripts/cli/base_vyostest_shim.py +++ b/smoketest/scripts/cli/base_vyostest_shim.py @@ -65,16 +65,19 @@ class VyOSUnitTestSHIM: @classmethod def tearDownClass(cls): - # discard any pending changes which might caused a messed up config - cls._session.discard() - # ... and restore the initial state - cls._session.migrate_and_load_config(save_config) - try: + # commit pending changes done by derived tearDownClass() + # implementations like CLI cleanup cls._session.commit() except (ConfigError, ConfigSessionError): + # discard any pending changes which might have failed, causing a + # messed up config cls._session.discard() cls.fail(cls) + finally: + # restore previous configuration before the test + cls._session.migrate_and_load_config(save_config) + cls._session.commit() def setUp(self): pass |