cloud-init-dev team mailing list archive
-
cloud-init-dev team
-
Mailing list archive
-
Message #01102
[Merge] lp:~paelzer/cloud-init/fix-mcollect-for-checkers into lp:cloud-init
ChristianEhrhardt has proposed merging lp:~paelzer/cloud-init/fix-mcollect-for-checkers into lp:cloud-init.
Commit message:
Fix flake8 checker errors in mcollect unittest.
Requested reviews:
Server Team CI bot (server-team-bot): continuous-integration
cloud init development team (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~paelzer/cloud-init/fix-mcollect-for-checkers/+merge/302516
Latest upstream fails on flake8 checks - just a minor cleanup to get rid of those.
--
Your team cloud init development team is requested to review the proposed merge of lp:~paelzer/cloud-init/fix-mcollect-for-checkers into lp:cloud-init.
=== modified file 'tests/unittests/test_handler/test_handler_mcollective.py'
--- tests/unittests/test_handler/test_handler_mcollective.py 2016-07-19 18:46:14 +0000
+++ tests/unittests/test_handler/test_handler_mcollective.py 2016-08-10 08:39:21 +0000
@@ -49,7 +49,7 @@
self.tmp, "./" + cc_mcollective.SERVER_CFG)
self.pubcert_file = os.path.join(
self.tmp, "./" + cc_mcollective.PUBCERT_FILE)
- self.pricert_file= os.path.join(
+ self.pricert_file = os.path.join(
self.tmp, self.tmp, "./" + cc_mcollective.PRICERT_FILE)
def test_basic_config(self):
@@ -86,7 +86,8 @@
cc_mcollective.configure(config=cfg, server_cfg=self.server_cfg)
self.assertTrue(os.path.exists(self.server_cfg))
self.assertTrue(os.path.exists(self.server_cfg + ".old"))
- self.assertEqual(util.load_file(self.server_cfg + ".old"), STOCK_CONFIG)
+ self.assertEqual(util.load_file(self.server_cfg + ".old"),
+ STOCK_CONFIG)
def test_existing_updated(self):
cfg = {'loglevel': 'warn'}
@@ -102,8 +103,9 @@
'private-cert': "secret private certificate"}
cc_mcollective.configure(config=cfg,
- server_cfg=self.server_cfg, pricert_file=self.pricert_file,
- pubcert_file=self.pubcert_file)
+ server_cfg=self.server_cfg,
+ pricert_file=self.pricert_file,
+ pubcert_file=self.pubcert_file)
found = configobj.ConfigObj(self.server_cfg)
References