From 20bd192db661e519b860a0799de04c663ceae0c6 Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Tue, 18 Jan 2022 20:46:14 -0700 Subject: cmd: status and cloud-id avoid change in behavior for 'not run' (#1197) snapd currrently looks for 'not run' from cloud-init status[1]. Avoid changing this behavior and revert "not-run" value to "not run". This avoids having to get snapd to change implementation and release updates as far back as Bionic to handle a hyphenated not-run string. [1]: https://github.com/snapcore/snapd/blob/master/sysconfig/\ cloudinit.go#L802 --- tests/unittests/cmd/test_status.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/unittests/cmd/test_status.py b/tests/unittests/cmd/test_status.py index 17d27597..c5f424da 100644 --- a/tests/unittests/cmd/test_status.py +++ b/tests/unittests/cmd/test_status.py @@ -137,7 +137,7 @@ class TestStatus(CiTestCase): ) def test_status_returns_not_run(self): - """When status.json does not exist yet, return 'not-run'.""" + """When status.json does not exist yet, return 'not run'.""" self.assertFalse( os.path.exists(self.status_file), "Unexpected status.json found" ) @@ -154,7 +154,7 @@ class TestStatus(CiTestCase): cmdargs, ) self.assertEqual(0, retcode) - self.assertEqual("status: not-run\n", m_stdout.getvalue()) + self.assertEqual("status: not run\n", m_stdout.getvalue()) def test_status_returns_disabled_long_on_presence_of_disable_file(self): """When cloudinit is disabled, return disabled reason.""" -- cgit v1.2.3