Merge lp:~sinzui/juju-ci-tools/un-redefine into lp:juju-ci-tools

[Curtis Hovey]

Fixed test names to avoid redefinition.

I copied the test names from client to version_client, but did not renamed them.

[lp:~sinzui/juju-ci-tools/un-redefine]

1975. By Curtis Hovey on 2017-04-04

Deleted duplicate test and restored name of other.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'jujupy/tests/test_version_client.py'
--- jujupy/tests/test_version_client.py	2017-04-03 16:25:51 +0000
+++ jujupy/tests/test_version_client.py	2017-04-04 15:13:00 +0000
@@ -361,19 +361,6 @@
         with self.assertRaises(NameNotAccepted):
             client.add_cloud_interactive('invalid/name', cloud)
 
-    def test_add_cloud_interactive_vsphere(self):
-        client = self.fake_juju_client()
-        clouds = {'foo': {
-            'type': 'vsphere',
-            'endpoint': 'http://bar.example.com',
-            'regions': {
-                'harvey': {},
-                'steve': {},
-                }
-            }}
-        client.add_cloud_interactive('foo', clouds['foo'])
-        self.assertEqual(client._backend.clouds, clouds)
-
     def test_add_cloud_interactive_vsphere_invalid_endpoint(self):
         client = self.fake_juju_client()
         clouds = {'foo': {