Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove six[6]"

Browse Source
This commit is contained in:
Zuul
2020-04-18 09:26:36 +00:00
committed by Gerrit Code Review
parent 7218947c5b 0ff8248f91
commit dc290d4502
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/tests/common/test_clients.py
View File

@@ -27,7 +27,6 @@ from monascaclient.v2_0 import client as monclient_v2
from neutronclient.neutron import client as netclient from neutronclient.neutron import client as netclient
from neutronclient.v2_0 import client as netclient_v2 from neutronclient.v2_0 import client as netclient_v2
from novaclient import client as nvclient from novaclient import client as nvclient
import six
from watcher.common import clients from watcher.common import clients
from watcher import conf from watcher import conf
@@ -139,8 +138,7 @@ class TestClients(base.TestCase):
osc = clients.OpenStackClients() osc = clients.OpenStackClients()
osc._nova = None osc._nova = None
ex = self.assertRaises(ValueError, osc.nova) ex = self.assertRaises(ValueError, osc.nova)
self.assertIn('Invalid nova_client.api_version 2.47', self.assertIn('Invalid nova_client.api_version 2.47', str(ex))
six.text_type(ex))
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')
def test_clients_nova_diff_endpoint(self, mock_session): def test_clients_nova_diff_endpoint(self, mock_session):