diff options
| author | Chad Smith <chad.smith@canonical.com> | 2019-01-31 03:52:13 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-01-31 03:52:13 +0000 |
| commit | 489553547f3461bd8ff67d3099237694130eb714 (patch) | |
| tree | 373e867be7edd8b9f558a5ed34b9c06ea5483c07 /cloudinit/cmd/tests | |
| parent | 94a64529dccebd8fe8c7969370b8696e46023fbd (diff) | |
| download | vyos-cloud-init-489553547f3461bd8ff67d3099237694130eb714.tar.gz vyos-cloud-init-489553547f3461bd8ff67d3099237694130eb714.zip | |
clean: cloud-init clean should not trace when run from within cloud_dir
Avoid traceback when cloud-init clean is run from within
/var/lib/cloud/ deleted dirs.
LP: #1795508
Diffstat (limited to 'cloudinit/cmd/tests')
| -rw-r--r-- | cloudinit/cmd/tests/test_clean.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/cmd/tests/test_clean.py b/cloudinit/cmd/tests/test_clean.py index 5a3ec3bf..15c3294e 100644 --- a/cloudinit/cmd/tests/test_clean.py +++ b/cloudinit/cmd/tests/test_clean.py @@ -136,7 +136,8 @@ class TestClean(CiTestCase): clean.remove_artifacts, remove_logs=False) self.assertEqual(1, retcode) self.assertEqual( - 'ERROR: Could not remove dir1: oops\n', m_stderr.getvalue()) + 'ERROR: Could not remove %s/dir1: oops\n' % self.artifact_dir, + m_stderr.getvalue()) def test_handle_clean_args_reboots(self): """handle_clean_args_reboots when reboot arg is provided.""" |