From 93afde09d89e60c29dfd20790e30a06f031c82e1 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Tue, 14 Jun 2016 14:56:51 -0700
Subject: Make the bin/cloud-init an actual console entrypoint

This allows for the test_cli test to be more sane.
---
 tests/unittests/test_cli.py | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

(limited to 'tests/unittests')

diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py
index 163ce64c..8268cd5e 100644
--- a/tests/unittests/test_cli.py
+++ b/tests/unittests/test_cli.py
@@ -6,7 +6,7 @@ import sys
 from . import helpers as test_helpers
 mock = test_helpers.mock
 
-BIN_CLOUDINIT = "bin/cloud-init"
+from cloudinit.cmd import main as cli
 
 
 class TestCLI(test_helpers.FilesystemMockingTestCase):
@@ -15,35 +15,22 @@ class TestCLI(test_helpers.FilesystemMockingTestCase):
         super(TestCLI, self).setUp()
         self.stderr = six.StringIO()
         self.patchStdoutAndStderr(stderr=self.stderr)
-        self.sys_exit = mock.MagicMock()
-        self.patched_funcs.enter_context(
-            mock.patch.object(sys, 'exit', self.sys_exit))
-
-    def _call_main(self):
-        self.patched_funcs.enter_context(
-            mock.patch.object(sys, 'argv', ['cloud-init']))
-        cli = imp.load_module(
-            'cli', open(BIN_CLOUDINIT), '', ('', 'r', imp.PY_SOURCE))
+
+    def _call_main(self, sysv_args=None):
+        if not sysv_args:
+            sysv_args = ['cloud-init']
         try:
-            return cli.main()
-        except Exception:
-            pass
+            return cli.main(sysv_args=sysv_args)
+        except SystemExit as e:
+            return e.code
 
-    @test_helpers.skipIf(not os.path.isfile(BIN_CLOUDINIT), "no bin/cloudinit")
     def test_no_arguments_shows_usage(self):
-        self._call_main()
-        self.assertIn('usage: cloud-init', self.stderr.getvalue())
-
-    @test_helpers.skipIf(not os.path.isfile(BIN_CLOUDINIT), "no bin/cloudinit")
-    def test_no_arguments_exits_2(self):
         exit_code = self._call_main()
-        if self.sys_exit.call_count:
-            self.assertEqual(mock.call(2), self.sys_exit.call_args)
-        else:
-            self.assertEqual(2, exit_code)
+        self.assertIn('usage: cloud-init', self.stderr.getvalue())
+        self.assertEqual(2, exit_code)
 
-    @test_helpers.skipIf(not os.path.isfile(BIN_CLOUDINIT), "no bin/cloudinit")
     def test_no_arguments_shows_error_message(self):
-        self._call_main()
+        exit_code = self._call_main()
         self.assertIn('cloud-init: error: too few arguments',
                       self.stderr.getvalue())
+        self.assertEqual(2, exit_code)
-- 
cgit v1.2.3


From 417fda64958f04c705860b737787fc921b965ade Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Wed, 15 Jun 2016 12:17:05 -0700
Subject: Fix a few tools and tests for newer pep8

---
 tests/unittests/test_cli.py | 3 ++-
 tools/run-pep8              | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/unittests')

diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py
index 8268cd5e..a53e7116 100644
--- a/tests/unittests/test_cli.py
+++ b/tests/unittests/test_cli.py
@@ -4,10 +4,11 @@ import six
 import sys
 
 from . import helpers as test_helpers
-mock = test_helpers.mock
 
 from cloudinit.cmd import main as cli
 
+mock = test_helpers.mock
+
 
 class TestCLI(test_helpers.FilesystemMockingTestCase):
 
diff --git a/tools/run-pep8 b/tools/run-pep8
index 086400fc..4bd0bbfb 100755
--- a/tools/run-pep8
+++ b/tools/run-pep8
@@ -1,8 +1,7 @@
 #!/bin/bash
 
-pycheck_dirs=( "cloudinit/" "bin/" "tests/" "tools/" )
-# FIXME: cloud-init modifies sys module path, pep8 does not like
-# bin_files=( "bin/cloud-init" )
+pycheck_dirs=( "cloudinit/" "tests/" "tools/" )
+
 CR="
 "
 [ "$1" = "-v" ] && { verbose="$1"; shift; } || verbose=""
-- 
cgit v1.2.3


From b77f11b35bf0978247fc88d0f4239c5bd4f65d66 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Wed, 15 Jun 2016 12:19:12 -0700
Subject: Remove some unused imports

---
 tests/unittests/test_cli.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tests/unittests')

diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py
index a53e7116..5fa252f7 100644
--- a/tests/unittests/test_cli.py
+++ b/tests/unittests/test_cli.py
@@ -1,7 +1,4 @@
-import imp
-import os
 import six
-import sys
 
 from . import helpers as test_helpers
 
-- 
cgit v1.2.3