diff options
author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-02-26 15:37:36 +0000 |
---|---|---|
committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-02-26 15:37:36 +0000 |
commit | 1182ad5f9362e1570c622345a3ac996c07eb2eeb (patch) | |
tree | 273ec82d32d08b67ca2b488c0c991093c29dbdd0 /cloudinit/tests | |
parent | f278a8a3dbb1e45e8d83491ad24e41812cb77ddb (diff) | |
download | vyos-cloud-init-1182ad5f9362e1570c622345a3ac996c07eb2eeb.tar.gz vyos-cloud-init-1182ad5f9362e1570c622345a3ac996c07eb2eeb.zip |
tests: fix some slow tests and some leaking state
In test_ds_identify, don't mutate otherwise-static test data. When
running tests in a random order, this was causing failures due to
breaking preconditions for other tests.
In tests/helpers, reset logging level in tearDown. Some of the CLI
tests set the level of the root logger in a way that isn't correctly
reset.
For test_poll_imds_re_dhcp_on_timeout and
test_dhcp_discovery_run_in_sandbox_warns_invalid_pid, mock out
time.sleep; this saves ~11 seconds (or ~40% of previous test time!).
Diffstat (limited to 'cloudinit/tests')
-rw-r--r-- | cloudinit/tests/helpers.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cloudinit/tests/helpers.py b/cloudinit/tests/helpers.py index 2eb7b0cd..46a49416 100644 --- a/cloudinit/tests/helpers.py +++ b/cloudinit/tests/helpers.py @@ -207,6 +207,7 @@ class CiTestCase(TestCase): if self.with_logs: # Remove the handler we setup logging.getLogger().handlers = self.old_handlers + logging.getLogger().level = None util.subp = _real_subp super(CiTestCase, self).tearDown() |