diff --git a/libra/tests/worker/test_controller.py b/libra/tests/worker/test_controller.py index 58abf8ad..44be5878 100644 --- a/libra/tests/worker/test_controller.py +++ b/libra/tests/worker/test_controller.py @@ -38,7 +38,7 @@ class TestWorkerController(TestCase): controller = c(self.driver, msg) response = controller.run() self.assertIn(c.RESPONSE_FIELD, response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) def testCaseSensitive(self): msg = { @@ -68,7 +68,7 @@ class TestWorkerController(TestCase): controller = c(self.driver, msg) response = controller.run() self.assertIn(c.RESPONSE_FIELD, response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) def testSuspend(self): msg = { @@ -77,7 +77,7 @@ class TestWorkerController(TestCase): controller = c(self.driver, msg) response = controller.run() self.assertIn(c.RESPONSE_FIELD, response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) def testEnable(self): msg = { @@ -86,7 +86,7 @@ class TestWorkerController(TestCase): controller = c(self.driver, msg) response = controller.run() self.assertIn(c.RESPONSE_FIELD, response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) def testDelete(self): msg = { @@ -95,7 +95,7 @@ class TestWorkerController(TestCase): controller = c(self.driver, msg) response = controller.run() self.assertIn(c.RESPONSE_FIELD, response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) def testUpdateMissingNodeID(self): msg = { @@ -116,7 +116,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing node 'id'") + self.assertEqual(msg, "Missing node 'id'") def testUpdateEmptyNodeID(self): msg = { @@ -138,7 +138,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing node 'id'") + self.assertEqual(msg, "Missing node 'id'") def testUpdateMissingLBs(self): msg = { @@ -148,7 +148,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing '%s' element" % c.LBLIST_FIELD) + self.assertEqual(msg, "Missing '%s' element" % c.LBLIST_FIELD) def testUpdateMissingNodes(self): msg = { @@ -159,7 +159,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing 'nodes' element") + self.assertEqual(msg, "Missing 'nodes' element") def testUpdateMissingProto(self): msg = { @@ -180,7 +180,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing required 'protocol' value.") + self.assertEqual(msg, "Missing required 'protocol' value.") def testUpdateGoodMonitor(self): msg = { @@ -208,7 +208,7 @@ class TestWorkerController(TestCase): controller = c(self.driver, msg) response = controller.run() self.assertNotIn('badRequest', response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) def testUpdateMonitorMissingType(self): msg = { @@ -236,7 +236,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing monitor value 'type'") + self.assertEqual(msg, "Missing monitor value 'type'") def testUpdateMonitorMissingDelay(self): msg = { @@ -264,7 +264,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing monitor value 'delay'") + self.assertEqual(msg, "Missing monitor value 'delay'") def testUpdateMonitorMissingTimeout(self): msg = { @@ -292,7 +292,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing monitor value 'timeout'") + self.assertEqual(msg, "Missing monitor value 'timeout'") def testUpdateMonitorMissingAttempts(self): msg = { @@ -320,7 +320,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing monitor value 'attempts'") + self.assertEqual(msg, "Missing monitor value 'attempts'") def testUpdateMonitorMissingPath(self): msg = { @@ -347,7 +347,7 @@ class TestWorkerController(TestCase): controller = c(self.driver, msg) response = controller.run() self.assertIn(c.RESPONSE_FIELD, response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) def testBadAlgorithm(self): msg = { @@ -369,7 +369,7 @@ class TestWorkerController(TestCase): controller = c(self.driver, msg) response = controller.run() self.assertIn(c.RESPONSE_FIELD, response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) def testDiscover(self): msg = { @@ -379,9 +379,9 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('version', response) self.assertIn('release', response) - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) - self.assertEquals(response['version'], libra_version) - self.assertEquals(response['release'], libra_release) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) + self.assertEqual(response['version'], libra_version) + self.assertEqual(response['release'], libra_release) def testArchiveMissingMethod(self): msg = { @@ -392,7 +392,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing '%s' element" % c.OBJ_STORE_TYPE_FIELD) + self.assertEqual(msg, "Missing '%s' element" % c.OBJ_STORE_TYPE_FIELD) def testArchiveInvalidMethod(self): msg = { @@ -419,7 +419,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, + self.assertEqual(msg, "Missing '%s' element" % c.OBJ_STORE_BASEPATH_FIELD) # Missing endpoint field @@ -434,7 +434,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, + self.assertEqual(msg, "Missing '%s' element" % c.OBJ_STORE_ENDPOINT_FIELD) # Missing token field @@ -449,7 +449,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, + self.assertEqual(msg, "Missing '%s' element" % c.OBJ_STORE_TOKEN_FIELD) # Missing load balancer field @@ -464,7 +464,7 @@ class TestWorkerController(TestCase): response = controller.run() self.assertIn('badRequest', response) msg = response['badRequest']['validationErrors']['message'] - self.assertEquals(msg, "Missing '%s' element" % c.LBLIST_FIELD) + self.assertEqual(msg, "Missing '%s' element" % c.LBLIST_FIELD) def testArchiveNotImplemented(self): msg = { @@ -478,7 +478,7 @@ class TestWorkerController(TestCase): null_driver = LoadBalancerDriver() controller = c(null_driver, msg) response = controller.run() - self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) + self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_FAILURE) self.assertIn(c.ERROR_FIELD, response) - self.assertEquals(response[c.ERROR_FIELD], + self.assertEqual(response[c.ERROR_FIELD], "Selected driver does not support ARCHIVE action.") diff --git a/libra/tests/worker/test_stats.py b/libra/tests/worker/test_stats.py index bc86f31d..e3413527 100644 --- a/libra/tests/worker/test_stats.py +++ b/libra/tests/worker/test_stats.py @@ -33,12 +33,12 @@ class TestStatisticsManager(TestCase): super(TestStatisticsManager, self).tearDown() def testReadNoStatsFile(self): - self.assertEquals(self.mgr.get_start(), None) - self.assertEquals(self.mgr.get_end(), None) - self.assertEquals(self.mgr.get_last_tcp_bytes(), 0) - self.assertEquals(self.mgr.get_last_http_bytes(), 0) - self.assertEquals(self.mgr.get_unreported_tcp_bytes(), 0) - self.assertEquals(self.mgr.get_unreported_http_bytes(), 0) + self.assertEqual(self.mgr.get_start(), None) + self.assertEqual(self.mgr.get_end(), None) + self.assertEqual(self.mgr.get_last_tcp_bytes(), 0) + self.assertEqual(self.mgr.get_last_http_bytes(), 0) + self.assertEqual(self.mgr.get_unreported_tcp_bytes(), 0) + self.assertEqual(self.mgr.get_unreported_http_bytes(), 0) def testSave(self): start_ts = datetime.datetime(2013, 1, 31, 12, 10, 30, 123456) @@ -52,25 +52,25 @@ class TestStatisticsManager(TestCase): tcp_bytes=tcp_bytes, http_bytes=http_bytes) self.mgr.read() - self.assertEquals(self.mgr.get_start(), start_ts) - self.assertEquals(self.mgr.get_end(), end_ts) - self.assertEquals(self.mgr.get_last_tcp_bytes(), tcp_bytes) - self.assertEquals(self.mgr.get_last_http_bytes(), http_bytes) - self.assertEquals(self.mgr.get_unreported_tcp_bytes(), 0) - self.assertEquals(self.mgr.get_unreported_http_bytes(), 0) + self.assertEqual(self.mgr.get_start(), start_ts) + self.assertEqual(self.mgr.get_end(), end_ts) + self.assertEqual(self.mgr.get_last_tcp_bytes(), tcp_bytes) + self.assertEqual(self.mgr.get_last_http_bytes(), http_bytes) + self.assertEqual(self.mgr.get_unreported_tcp_bytes(), 0) + self.assertEqual(self.mgr.get_unreported_http_bytes(), 0) self.mgr.save(start_ts, end_ts, unreported_tcp_bytes=unreported_tcp_bytes, unreported_http_bytes=unreported_http_bytes) self.mgr.read() - self.assertEquals(self.mgr.get_start(), start_ts) - self.assertEquals(self.mgr.get_end(), end_ts) - self.assertEquals(self.mgr.get_last_tcp_bytes(), 0) - self.assertEquals(self.mgr.get_last_http_bytes(), 0) - self.assertEquals(self.mgr.get_unreported_tcp_bytes(), + self.assertEqual(self.mgr.get_start(), start_ts) + self.assertEqual(self.mgr.get_end(), end_ts) + self.assertEqual(self.mgr.get_last_tcp_bytes(), 0) + self.assertEqual(self.mgr.get_last_http_bytes(), 0) + self.assertEqual(self.mgr.get_unreported_tcp_bytes(), unreported_tcp_bytes) - self.assertEquals(self.mgr.get_unreported_http_bytes(), + self.assertEqual(self.mgr.get_unreported_http_bytes(), unreported_http_bytes) self.mgr.save(start_ts, end_ts, @@ -80,11 +80,11 @@ class TestStatisticsManager(TestCase): unreported_http_bytes=unreported_http_bytes) self.mgr.read() - self.assertEquals(self.mgr.get_start(), start_ts) - self.assertEquals(self.mgr.get_end(), end_ts) - self.assertEquals(self.mgr.get_last_tcp_bytes(), tcp_bytes) - self.assertEquals(self.mgr.get_last_http_bytes(), http_bytes) - self.assertEquals(self.mgr.get_unreported_tcp_bytes(), + self.assertEqual(self.mgr.get_start(), start_ts) + self.assertEqual(self.mgr.get_end(), end_ts) + self.assertEqual(self.mgr.get_last_tcp_bytes(), tcp_bytes) + self.assertEqual(self.mgr.get_last_http_bytes(), http_bytes) + self.assertEqual(self.mgr.get_unreported_tcp_bytes(), unreported_tcp_bytes) - self.assertEquals(self.mgr.get_unreported_http_bytes(), + self.assertEqual(self.mgr.get_unreported_http_bytes(), unreported_http_bytes) diff --git a/tox.ini b/tox.ini index fb8bef60..1ea3c22a 100644 --- a/tox.ini +++ b/tox.ini @@ -19,6 +19,7 @@ commands = flake8 [flake8] ignore = H +select = H234 show-source = True exclude = .venv,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tests,build