cloud-init-dev team mailing list archive

[Ryan Harper <ryan.harper@xxxxxxxxxxxxx>]

Ryan Harper has proposed merging ~raharper/cloud-init:fix-make-check into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/301176

Fix make check on master.
-- 
Your team cloud init development team is requested to review the proposed merge of ~raharper/cloud-init:fix-make-check into cloud-init:master.

diff --git a/tests/unittests/test_handler/test_handler_mcollective.py b/tests/unittests/test_handler/test_handler_mcollective.py
index 6aefb93..09a8e69 100644
--- a/tests/unittests/test_handler/test_handler_mcollective.py
+++ b/tests/unittests/test_handler/test_handler_mcollective.py
@@ -49,7 +49,7 @@ class TestConfig(t_help.FilesystemMockingTestCase):
             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 @@ class TestConfig(t_help.FilesystemMockingTestCase):
         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'}
@@ -101,9 +102,9 @@ class TestConfig(t_help.FilesystemMockingTestCase):
                'public-cert': "this is my public-certificate",
                '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)
+        cc_mcollective.configure(config=cfg, server_cfg=self.server_cfg,
+                                 pricert_file=self.pricert_file,
+                                 pubcert_file=self.pubcert_file)
 
         found = configobj.ConfigObj(self.server_cfg)