Merge lp:~abentley/juju-ci-tools/manual-endpoint-xfail into lp:juju-ci-tools

[Aaron Bentley]

Update with expected endpoint failures for manual.

This branch adds expected failures for manual endpoints due to bug #1649721

In some cases, this means wrapping expected failures inside other expected failures!

Also fixed some lint as a driveby.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'assess_add_cloud.py'
--- assess_add_cloud.py	2016-12-13 19:32:27 +0000
+++ assess_add_cloud.py	2016-12-14 20:18:04 +0000
@@ -103,14 +103,23 @@
     yield cloud_spec('bogus-type', 'bogus-type', {'type': 'bogus'},
                      exception=TypeNotAccepted)
     for cloud_name, cloud in clouds.items():
-        yield cloud_spec(cloud_name, cloud_name, cloud)
+        spec = cloud_spec(cloud_name, cloud_name, cloud)
+        if cloud['type'] == 'manual':
+            spec = xfail(spec, 1649721, InvalidEndpoint)
+        yield spec
 
     for cloud_name, cloud in clouds.items():
-        yield xfail(cloud_spec('long-name-{}'.format(cloud_name), 'A' * 4096,
-                               cloud, NameNotAccepted), 1641970, NameMismatch)
-        yield xfail(
+        spec = xfail(cloud_spec('long-name-{}'.format(cloud_name), 'A' * 4096,
+                                cloud, NameNotAccepted), 1641970, NameMismatch)
+        if cloud['type'] == 'manual':
+            spec = xfail(spec, 1649721, InvalidEndpoint)
+        yield spec
+        spec = xfail(
             cloud_spec('invalid-name-{}'.format(cloud_name), 'invalid/name',
                        cloud, NameNotAccepted), 1641981, None)
+        if cloud['type'] == 'manual':
+            spec = xfail(spec, 1649721, InvalidEndpoint)
+        yield spec
 
         if cloud['type'] not in ('maas', 'manual', 'vsphere'):
             variant = deepcopy(cloud)

=== modified file 'deploy_stack.py'
--- deploy_stack.py	2016-12-13 16:37:28 +0000
+++ deploy_stack.py	2016-12-14 20:18:04 +0000
@@ -1072,8 +1072,8 @@
             deploy_dummy_stack(client, charm_series, args.use_charmstore)
         assess_juju_relations(client)
         skip_juju_run = (
-            (client.version < "2" and sys.platform in ("win32", "darwin"))
-            or charm_series.startswith(("centos", "win")))
+            (client.version < "2" and sys.platform in ("win32", "darwin")) or
+            charm_series.startswith(("centos", "win")))
         if not skip_juju_run:
             assess_juju_run(client)
         if args.upgrade:

=== modified file 'tests/test_assess_add_cloud.py'
--- tests/test_assess_add_cloud.py	2016-12-13 19:32:27 +0000
+++ tests/test_assess_add_cloud.py	2016-12-14 20:18:04 +0000
@@ -118,13 +118,13 @@
         cloud = {'type': 'manual', 'endpoint': 'http://example.com'}
         spec = cloud_spec('foo', 'foo', cloud)
         self.assertItemsEqual([
-            self.bogus_type, spec,
-            xfail(cloud_spec('long-name-foo', 'A' * 4096, cloud), 1641970,
-                  NameMismatch),
-            xfail(cloud_spec('invalid-name-foo', 'invalid/name', cloud,
-                             exception=NameNotAccepted), 1641981, None),
-            make_long_endpoint(spec),
-            ], iter_clouds({'foo': cloud}))
+            self.bogus_type, xfail(spec, 1649721, InvalidEndpoint),
+            xfail(xfail(cloud_spec('long-name-foo', 'A' * 4096, cloud),
+                        1641970, NameMismatch), 1649721, InvalidEndpoint),
+            xfail(xfail(cloud_spec('invalid-name-foo', 'invalid/name', cloud,
+                        exception=NameNotAccepted), 1641981, None),
+                  1649721, InvalidEndpoint),
+            make_long_endpoint(spec)], iter_clouds({'foo': cloud}))
 
     def test_vsphere(self):
         cloud = {

=== modified file 'tests/test_remote.py'
--- tests/test_remote.py	2016-12-13 14:57:04 +0000
+++ tests/test_remote.py	2016-12-14 20:18:04 +0000
@@ -151,7 +151,7 @@
             with patch.object(client, "get_juju_output") as mock_gjo:
                 mock_gjo.side_effect = error
                 with self.assertRaises(subprocess.CalledProcessError) as c:
-                    output = remote.run("cat /a/file")
+                    remote.run("cat /a/file")
         self.assertIs(c.exception, error)
         mock_gjo.assert_called_once_with("ssh", unit, "cat /a/file",
                                          timeout=120)
@@ -172,7 +172,7 @@
                 with patch("remote._no_platform_ssh", autospec=True,
                            return_value=True) as mock_nps:
                     with self.assertRaises(subprocess.CalledProcessError) as c:
-                        output = remote.run("cat /a/file")
+                        remote.run("cat /a/file")
         self.assertIs(c.exception, error)
         mock_gjo.assert_called_once_with("ssh", unit, "cat /a/file",
                                          timeout=120)