stackforge/libra
Code Issues Proposed changes

enable hacking check H234

Browse Source 
assertEquals() logs a DeprecationWarning in Python 3.x,
use assertEqual() instead. The same goes for assertNotEquals().

Change-Id: Id3491b278018736f2e41bc85aa475e8aafe5723d
This commit is contained in:
Christian Berendt
2014-05-29 14:04:35 +02:00
parent 2300c8952a
commit 9ab1625156
3 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libra/tests/worker/test_controller.py
View File

@@ -38,7 +38,7 @@ class TestWorkerController(TestCase):
controller = c(self.driver, msg) controller = c(self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) 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): def testCaseSensitive(self):
msg = { msg = {
@@ -68,7 +68,7 @@ class TestWorkerController(TestCase):
controller = c(self.driver, msg) controller = c(self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) 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): def testSuspend(self):
msg = { msg = {
@@ -77,7 +77,7 @@ class TestWorkerController(TestCase):
controller = c(self.driver, msg) controller = c(self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) 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): def testEnable(self):
msg = { msg = {
@@ -86,7 +86,7 @@ class TestWorkerController(TestCase):
controller = c(self.driver, msg) controller = c(self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) 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): def testDelete(self):
msg = { msg = {
@@ -95,7 +95,7 @@ class TestWorkerController(TestCase):
controller = c(self.driver, msg) controller = c(self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) 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): def testUpdateMissingNodeID(self):
msg = { msg = {
@@ -116,7 +116,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, "Missing node 'id'") self.assertEqual(msg, "Missing node 'id'")
def testUpdateEmptyNodeID(self): def testUpdateEmptyNodeID(self):
msg = { msg = {
@@ -138,7 +138,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, "Missing node 'id'") self.assertEqual(msg, "Missing node 'id'")
def testUpdateMissingLBs(self): def testUpdateMissingLBs(self):
msg = { msg = {
@@ -148,7 +148,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] 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): def testUpdateMissingNodes(self):
msg = { msg = {
@@ -159,7 +159,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, "Missing 'nodes' element") self.assertEqual(msg, "Missing 'nodes' element")
def testUpdateMissingProto(self): def testUpdateMissingProto(self):
msg = { msg = {
@@ -180,7 +180,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, "Missing required 'protocol' value.") self.assertEqual(msg, "Missing required 'protocol' value.")
def testUpdateGoodMonitor(self): def testUpdateGoodMonitor(self):
msg = { msg = {
@@ -208,7 +208,7 @@ class TestWorkerController(TestCase):
controller = c(self.driver, msg) controller = c(self.driver, msg)
response = controller.run() response = controller.run()
self.assertNotIn('badRequest', response) 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): def testUpdateMonitorMissingType(self):
msg = { msg = {
@@ -236,7 +236,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, "Missing monitor value 'type'") self.assertEqual(msg, "Missing monitor value 'type'")
def testUpdateMonitorMissingDelay(self): def testUpdateMonitorMissingDelay(self):
msg = { msg = {
@@ -264,7 +264,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, "Missing monitor value 'delay'") self.assertEqual(msg, "Missing monitor value 'delay'")
def testUpdateMonitorMissingTimeout(self): def testUpdateMonitorMissingTimeout(self):
msg = { msg = {
@@ -292,7 +292,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, "Missing monitor value 'timeout'") self.assertEqual(msg, "Missing monitor value 'timeout'")
def testUpdateMonitorMissingAttempts(self): def testUpdateMonitorMissingAttempts(self):
msg = { msg = {
@@ -320,7 +320,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, "Missing monitor value 'attempts'") self.assertEqual(msg, "Missing monitor value 'attempts'")
def testUpdateMonitorMissingPath(self): def testUpdateMonitorMissingPath(self):
msg = { msg = {
@@ -347,7 +347,7 @@ class TestWorkerController(TestCase):
controller = c(self.driver, msg) controller = c(self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) 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): def testBadAlgorithm(self):
msg = { msg = {
@@ -369,7 +369,7 @@ class TestWorkerController(TestCase):
controller = c(self.driver, msg) controller = c(self.driver, msg)
response = controller.run() response = controller.run()
self.assertIn(c.RESPONSE_FIELD, response) 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): def testDiscover(self):
msg = { msg = {
@@ -379,9 +379,9 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('version', response) self.assertIn('version', response)
self.assertIn('release', response) self.assertIn('release', response)
self.assertEquals(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS) self.assertEqual(response[c.RESPONSE_FIELD], c.RESPONSE_SUCCESS)
self.assertEquals(response['version'], libra_version) self.assertEqual(response['version'], libra_version)
self.assertEquals(response['release'], libra_release) self.assertEqual(response['release'], libra_release)
def testArchiveMissingMethod(self): def testArchiveMissingMethod(self):
msg = { msg = {
@@ -392,7 +392,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] 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): def testArchiveInvalidMethod(self):
msg = { msg = {
@@ -419,7 +419,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, self.assertEqual(msg,
"Missing '%s' element" % c.OBJ_STORE_BASEPATH_FIELD) "Missing '%s' element" % c.OBJ_STORE_BASEPATH_FIELD)
# Missing endpoint field # Missing endpoint field
@@ -434,7 +434,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, self.assertEqual(msg,
"Missing '%s' element" % c.OBJ_STORE_ENDPOINT_FIELD) "Missing '%s' element" % c.OBJ_STORE_ENDPOINT_FIELD)
# Missing token field # Missing token field
@@ -449,7 +449,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] msg = response['badRequest']['validationErrors']['message']
self.assertEquals(msg, self.assertEqual(msg,
"Missing '%s' element" % c.OBJ_STORE_TOKEN_FIELD) "Missing '%s' element" % c.OBJ_STORE_TOKEN_FIELD)
# Missing load balancer field # Missing load balancer field
@@ -464,7 +464,7 @@ class TestWorkerController(TestCase):
response = controller.run() response = controller.run()
self.assertIn('badRequest', response) self.assertIn('badRequest', response)
msg = response['badRequest']['validationErrors']['message'] 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): def testArchiveNotImplemented(self):
msg = { msg = {
@@ -478,7 +478,7 @@ class TestWorkerController(TestCase):
null_driver = LoadBalancerDriver() null_driver = LoadBalancerDriver()
controller = c(null_driver, msg) controller = c(null_driver, msg)
response = controller.run() 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.assertIn(c.ERROR_FIELD, response)
self.assertEquals(response[c.ERROR_FIELD], self.assertEqual(response[c.ERROR_FIELD],
"Selected driver does not support ARCHIVE action.") "Selected driver does not support ARCHIVE action.")

48
libra/tests/worker/test_stats.py
View File

@@ -33,12 +33,12 @@ class TestStatisticsManager(TestCase):
super(TestStatisticsManager, self).tearDown() super(TestStatisticsManager, self).tearDown()
def testReadNoStatsFile(self): def testReadNoStatsFile(self):
self.assertEquals(self.mgr.get_start(), None) self.assertEqual(self.mgr.get_start(), None)
self.assertEquals(self.mgr.get_end(), None) self.assertEqual(self.mgr.get_end(), None)
self.assertEquals(self.mgr.get_last_tcp_bytes(), 0) self.assertEqual(self.mgr.get_last_tcp_bytes(), 0)
self.assertEquals(self.mgr.get_last_http_bytes(), 0) self.assertEqual(self.mgr.get_last_http_bytes(), 0)
self.assertEquals(self.mgr.get_unreported_tcp_bytes(), 0) self.assertEqual(self.mgr.get_unreported_tcp_bytes(), 0)
self.assertEquals(self.mgr.get_unreported_http_bytes(), 0) self.assertEqual(self.mgr.get_unreported_http_bytes(), 0)
def testSave(self): def testSave(self):
start_ts = datetime.datetime(2013, 1, 31, 12, 10, 30, 123456) 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) tcp_bytes=tcp_bytes, http_bytes=http_bytes)
self.mgr.read() self.mgr.read()
self.assertEquals(self.mgr.get_start(), start_ts) self.assertEqual(self.mgr.get_start(), start_ts)
self.assertEquals(self.mgr.get_end(), end_ts) self.assertEqual(self.mgr.get_end(), end_ts)
self.assertEquals(self.mgr.get_last_tcp_bytes(), tcp_bytes) self.assertEqual(self.mgr.get_last_tcp_bytes(), tcp_bytes)
self.assertEquals(self.mgr.get_last_http_bytes(), http_bytes) self.assertEqual(self.mgr.get_last_http_bytes(), http_bytes)
self.assertEquals(self.mgr.get_unreported_tcp_bytes(), 0) self.assertEqual(self.mgr.get_unreported_tcp_bytes(), 0)
self.assertEquals(self.mgr.get_unreported_http_bytes(), 0) self.assertEqual(self.mgr.get_unreported_http_bytes(), 0)
self.mgr.save(start_ts, end_ts, self.mgr.save(start_ts, end_ts,
unreported_tcp_bytes=unreported_tcp_bytes, unreported_tcp_bytes=unreported_tcp_bytes,
unreported_http_bytes=unreported_http_bytes) unreported_http_bytes=unreported_http_bytes)
self.mgr.read() self.mgr.read()
self.assertEquals(self.mgr.get_start(), start_ts) self.assertEqual(self.mgr.get_start(), start_ts)
self.assertEquals(self.mgr.get_end(), end_ts) self.assertEqual(self.mgr.get_end(), end_ts)
self.assertEquals(self.mgr.get_last_tcp_bytes(), 0) self.assertEqual(self.mgr.get_last_tcp_bytes(), 0)
self.assertEquals(self.mgr.get_last_http_bytes(), 0) self.assertEqual(self.mgr.get_last_http_bytes(), 0)
self.assertEquals(self.mgr.get_unreported_tcp_bytes(), self.assertEqual(self.mgr.get_unreported_tcp_bytes(),
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) unreported_http_bytes)
self.mgr.save(start_ts, end_ts, self.mgr.save(start_ts, end_ts,
@@ -80,11 +80,11 @@ class TestStatisticsManager(TestCase):
unreported_http_bytes=unreported_http_bytes) unreported_http_bytes=unreported_http_bytes)
self.mgr.read() self.mgr.read()
self.assertEquals(self.mgr.get_start(), start_ts) self.assertEqual(self.mgr.get_start(), start_ts)
self.assertEquals(self.mgr.get_end(), end_ts) self.assertEqual(self.mgr.get_end(), end_ts)
self.assertEquals(self.mgr.get_last_tcp_bytes(), tcp_bytes) self.assertEqual(self.mgr.get_last_tcp_bytes(), tcp_bytes)
self.assertEquals(self.mgr.get_last_http_bytes(), http_bytes) self.assertEqual(self.mgr.get_last_http_bytes(), http_bytes)
self.assertEquals(self.mgr.get_unreported_tcp_bytes(), self.assertEqual(self.mgr.get_unreported_tcp_bytes(),
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) unreported_http_bytes)

1
tox.ini
View File

@@ -19,6 +19,7 @@ commands = flake8
[flake8] [flake8]
ignore = H ignore = H
select = H234
show-source = True show-source = True
exclude = .venv,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tests,build exclude = .venv,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tests,build