x
/
vmware-nsxlib
Code Issues Proposed changes

Fix for hacking N536 

Splitting assertEqual on a tuple with None into multiple
asserts, using aassertIsNone for expected None values.

Also fix the order of expected/observed in assertEqual calls.

Change-Id: I1c60c7d05ed8841178b6c9aabb7e1fb19d34818d
This commit is contained in:
Adit Sarfaty 2017-03-19 11:54:35 +02:00
parent 0c2c8c8dab
commit e4ef4dd59b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vmware_nsxlib/tests/unit/v3/test_cluster.py
View File

@ -54,11 +54,11 @@ class RequestsHTTPProviderTestCase(unittest.TestCase):
mock_api, cluster.Provider('9.8.7.6', 'https://9.8.7.6', mock_api, cluster.Provider('9.8.7.6', 'https://9.8.7.6',
'nsxuser', 'nsxpassword', None)) 'nsxuser', 'nsxpassword', None))
self.assertEqual(session.auth, ('nsxuser', 'nsxpassword')) self.assertEqual(('nsxuser', 'nsxpassword'), session.auth)
self.assertEqual(session.verify, False) self.assertFalse(session.verify)
self.assertIsNone(session.cert) self.assertIsNone(session.cert)
self.assertEqual(session.adapters['https://'].max_retries.total, 100) self.assertEqual(100, session.adapters['https://'].max_retries.total)
self.assertEqual(session.timeout, 99) self.assertEqual(99, session.timeout)
def test_new_connection_with_client_auth(self): def test_new_connection_with_client_auth(self):
mock_api = mock.Mock() mock_api = mock.Mock()
@ -76,10 +76,10 @@ class RequestsHTTPProviderTestCase(unittest.TestCase):
mock_api, cluster.Provider('9.8.7.6', 'https://9.8.7.6', mock_api, cluster.Provider('9.8.7.6', 'https://9.8.7.6',
None, None, None)) None, None, None))
self.assertEqual(session.auth, None) self.assertIsNone(session.auth)
self.assertEqual(session.verify, False) self.assertFalse(session.verify)
self.assertEqual(session.cert_provider, cert_provider_inst) self.assertEqual(cert_provider_inst, session.cert_provider)
self.assertEqual(session.timeout, 99) self.assertEqual(99, session.timeout)
def test_validate_connection(self): def test_validate_connection(self):
self.skipTest("Revist") self.skipTest("Revist")
@ -162,7 +162,7 @@ class ClusteredAPITestCase(nsxlib_testcase.NsxClientTestCase):
conf_managers = ['8.9.10.11', '9.10.11.12'] conf_managers = ['8.9.10.11', '9.10.11.12']
api = self.new_mocked_cluster(conf_managers, validate_fn) api = self.new_mocked_cluster(conf_managers, validate_fn)
self.assertEqual(api.health, expected_health) self.assertEqual(expected_health, api.health)
def test_orange_health(self): def test_orange_health(self):
@ -182,7 +182,7 @@ class ClusteredAPITestCase(nsxlib_testcase.NsxClientTestCase):
conf_managers = ['8.9.10.11', '9.10.11.12', '10.11.12.13'] conf_managers = ['8.9.10.11', '9.10.11.12', '10.11.12.13']
api = self.new_mocked_cluster(conf_managers, _validate_conn_down) api = self.new_mocked_cluster(conf_managers, _validate_conn_down)
self.assertEqual(len(api.endpoints), 3) self.assertEqual(3, len(api.endpoints))
self.assertRaises(nsxlib_exc.ServiceClusterUnavailable, self.assertRaises(nsxlib_exc.ServiceClusterUnavailable,
api.get, 'api/v1/transport-zones') api.get, 'api/v1/transport-zones')