Merge lp:~sinzui/juju-ci-tools/notraised-init into lp:juju-ci-tools

[Curtis Hovey]

Pass and accept cloud_spec to NotRaised.

This fixes the error seen in CI
   assess_all_clouds TypeError: __init__() takes exactly 1 argument (2 given)
   https://bugs.launchpad.net/juju-ci-tools/+bug/1679695

NotRaised.__init__ did not accept and argument, but thought it has a cloud_spec to look the for expected exception. The caller was passing the exception, not a cloud_spec.

There are also some indentation fixes to hush lint.

[Aaron Bentley (abentley)]

Thanks.

Your linter seems very different from flake8's.

At 51 and 60, maybe it would be better to put a newline before "spec", and indent all of the parameters to make_long_endpoint? It seems a bit odd to have parameters indented the same as the method.

review: Approve

[lp:~sinzui/juju-ci-tools/notraised-init]

1979. By Curtis Hovey on 2017-04-04

Revised intentation for lint.

=== modified file 'assess_add_cloud.py'
--- assess_add_cloud.py	2017-02-07 22:05:20 +0000
+++ assess_add_cloud.py	2017-04-04 19:35:45 +0000
@@ -42,7 +42,7 @@
 class NotRaised(Exception):
     """An expected exception was not raised."""
 
-    def __init__(self):
+    def __init__(self, cloud_spec):
         msg = 'Expected exception not raised: {}'.format(
             cloud_spec.exception)
         super(NotRaised, self).__init__(msg)
@@ -179,7 +179,7 @@
                 except cloud_spec.exception:
                     pass
                 else:
-                    raise NotRaised(cloud_spec.exception)
+                    raise NotRaised(cloud_spec)
         except Exception as e:
             logging.exception(e)
             failed.add(cloud_spec.label)

=== modified file 'tests/test_assess_add_cloud.py'
--- tests/test_assess_add_cloud.py	2017-02-07 22:05:20 +0000
+++ tests/test_assess_add_cloud.py	2017-04-04 19:35:45 +0000
@@ -35,8 +35,8 @@
 
     def test_cloud_spec(self):
         self.assertEqual(
-                CloudSpec('label1', 'name1', {'config': '1'}, None, None),
-                cloud_spec('label1', 'name1', {'config': '1'}))
+            CloudSpec('label1', 'name1', {'config': '1'}, None, None),
+            cloud_spec('label1', 'name1', {'config': '1'}))
 
 
 class TestXFail(TestCase):
@@ -63,7 +63,8 @@
             yield client
 
     def test_assess_cloud(self):
-        expected_cloud = {'clouds': {'foo': {
+        expected_cloud = {'clouds': {
+            'foo': {
                 'type': 'maas',
                 'endpoint': 'http://bar.example.com',
                 }}}
@@ -127,8 +128,10 @@
             xfail(xfail(cloud_spec('invalid-name-foo', 'invalid/name', cloud,
                         exception=NameNotAccepted), 1641981, None),
                   1649721, InvalidEndpoint),
-            make_long_endpoint(spec, endpoint_validation=True)],
-                iter_clouds({'foo': cloud}, endpoint_validation=True))
+            make_long_endpoint(
+                spec, endpoint_validation=True)
+            ],
+            iter_clouds({'foo': cloud}, endpoint_validation=True))
 
     def test_manual_no_validation(self):
         self.maxDiff = None
@@ -140,8 +143,10 @@
                   1641970, NameMismatch),
             xfail(cloud_spec('invalid-name-foo', 'invalid/name', cloud,
                              exception=NameNotAccepted), 1641981, None),
-            make_long_endpoint(spec, endpoint_validation=False)],
-                iter_clouds({'foo': cloud}, endpoint_validation=False))
+            make_long_endpoint(
+                spec, endpoint_validation=False)
+            ],
+            iter_clouds({'foo': cloud}, endpoint_validation=False))
 
     def test_vsphere(self):
         cloud = {
@@ -156,7 +161,8 @@
                              exception=NameNotAccepted), 1641981, None),
             xfail(cloud_spec('long-name-foo', 'A' * 4096, cloud,
                              exception=None), 1641970, NameMismatch),
-            make_long_endpoint(spec, regions=True, endpoint_validation=True),
+            make_long_endpoint(
+                spec, regions=True, endpoint_validation=True),
             ], iter_clouds({'foo': cloud}, endpoint_validation=True))
 
     def test_vsphere_no_validation(self):
@@ -287,6 +293,23 @@
         self.assertEqual({27: {'label1'}}, xfailed)
         self.assertEqual(0, exception_mock.call_count)
 
+    def test_failed_notraised(self):
+        client = fake_juju_client(juju_home=self.juju_home)
+        cloud_specs = [
+            cloud_spec('label', 'name', {'config': '1'}, TypeNotAccepted)]
+        with patch('assess_add_cloud.assess_cloud'):
+            with patch('logging.exception') as exception_mock:
+                with patch('sys.stdout'):
+                    succeeded, xfailed, failed = assess_all_clouds(client,
+                                                                   cloud_specs)
+        self.assertEqual(set(['label']), failed)
+        self.assertEqual(1, exception_mock.call_count)
+        raised_e = exception_mock.mock_calls[0][1][0]
+        self.assertEqual(
+            "Expected exception not raised: "
+            "<class 'jujupy.client.TypeNotAccepted'>",
+            raised_e.message)
+
 
 class TestWriteStatus(FakeHomeTestCase):