From c06eea972eb4b7bfa68f4f542f2fb67ea1d455ac Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 20 Oct 2017 16:05:04 -0600 Subject: citest: fix remaining warnings raised by integration tests. There was fallout in a full integration test run from my adding of test_no_warnings_in_log which asserted that there could not be a WARNING found in the /var/log/cloud-init.log This fixes 2 of the cases: * TestCommandOutputSimple had a valid WARNING written, so adjust its test case to allow for that. * TestLxdDir had a valid config in the test but the module would log a WARNING, so fix the module. Also updates lxd unit tests to look for WARN themselves. --- tests/cloud_tests/testcases/base.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/cloud_tests/testcases/base.py') diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py index d3586e3c..1706f59b 100644 --- a/tests/cloud_tests/testcases/base.py +++ b/tests/cloud_tests/testcases/base.py @@ -70,7 +70,11 @@ class CloudTestCase(unittest.TestCase): def test_no_warnings_in_log(self): """Warnings should not be found in the log.""" - self.assertNotIn("WARN", self.get_data_file('cloud-init.log')) + self.assertEqual( + [], + [l for l in self.get_data_file('cloud-init.log').splitlines() + if 'WARN' in l], + msg="'WARN' found inside cloud-init.log") class PasswordListTest(CloudTestCase): -- cgit v1.2.3