From d898f7b738070b646d217005ffb493b2854da62c Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Thu, 29 May 2014 12:41:35 +0200 Subject: [PATCH] change assertEquals to assertEqual According to http://docs.python.org/2/library/unittest.html assertEquals is a deprecated alias of assertEqual. Change-Id: I5351049bd6104d315ae0c5a87f7b8e2618a69bfe --- mistralclient/tests/test_executions.py | 16 ++++++++-------- mistralclient/tests/test_listeners.py | 16 ++++++++-------- mistralclient/tests/test_tasks.py | 6 +++--- mistralclient/tests/test_workbooks.py | 16 ++++++++-------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/mistralclient/tests/test_executions.py b/mistralclient/tests/test_executions.py index 27674d4e..6610bd12 100644 --- a/mistralclient/tests/test_executions.py +++ b/mistralclient/tests/test_executions.py @@ -57,8 +57,8 @@ class TestExecutions(base.BaseClientTest): EXECS[0]['context']) self.assertIsNotNone(ex) - self.assertEquals(Execution(self.executions, EXECS[0]).__dict__, - ex.__dict__) + self.assertEqual(Execution(self.executions, EXECS[0]).__dict__, + ex.__dict__) mock.assert_called_once_with( URL_TEMPLATE % EXECS[0]['workbook_name'], json.dumps(body)) @@ -104,8 +104,8 @@ class TestExecutions(base.BaseClientTest): EXECS[0]['state']) self.assertIsNotNone(ex) - self.assertEquals(Execution(self.executions, EXECS[0]).__dict__, - ex.__dict__) + self.assertEqual(Execution(self.executions, EXECS[0]).__dict__, + ex.__dict__) mock.assert_called_once_with( URL_TEMPLATE_ID % (EXECS[0]['workbook_name'], EXECS[0]['id']), json.dumps(body)) @@ -118,8 +118,8 @@ class TestExecutions(base.BaseClientTest): self.assertEqual(1, len(executions)) ex = executions[0] - self.assertEquals(Execution(self.executions, EXECS[0]).__dict__, - ex.__dict__) + self.assertEqual(Execution(self.executions, EXECS[0]).__dict__, + ex.__dict__) mock.assert_called_once_with(URL_TEMPLATE % EXECS[0]['workbook_name']) def test_get(self): @@ -127,8 +127,8 @@ class TestExecutions(base.BaseClientTest): ex = self.executions.get(EXECS[0]['workbook_name'], EXECS[0]['id']) - self.assertEquals(Execution(self.executions, EXECS[0]).__dict__, - ex.__dict__) + self.assertEqual(Execution(self.executions, EXECS[0]).__dict__, + ex.__dict__) mock.assert_called_once_with( URL_TEMPLATE_ID % (EXECS[0]['workbook_name'], EXECS[0]['id'])) diff --git a/mistralclient/tests/test_listeners.py b/mistralclient/tests/test_listeners.py index 9ac8fd86..0f64b3c2 100644 --- a/mistralclient/tests/test_listeners.py +++ b/mistralclient/tests/test_listeners.py @@ -49,8 +49,8 @@ class TestListeners(base.BaseClientTest): LISTENERS[0]['description']) self.assertIsNotNone(lsnr) - self.assertEquals(Listener(self.listeners, LISTENERS[0]).__dict__, - lsnr.__dict__) + self.assertEqual(Listener(self.listeners, LISTENERS[0]).__dict__, + lsnr.__dict__) mock.assert_called_once_with( URL_TEMPLATE % (LISTENERS[0]['workbook_name']), json.dumps(body)) @@ -71,8 +71,8 @@ class TestListeners(base.BaseClientTest): LISTENERS[0]['description']) self.assertIsNotNone(lsnr) - self.assertEquals(Listener(self.listeners, LISTENERS[0]).__dict__, - lsnr.__dict__) + self.assertEqual(Listener(self.listeners, LISTENERS[0]).__dict__, + lsnr.__dict__) mock.assert_called_once_with( URL_TEMPLATE_ID % (LISTENERS[0]['workbook_name'], LISTENERS[0]['id']), @@ -86,8 +86,8 @@ class TestListeners(base.BaseClientTest): self.assertEqual(1, len(listeners)) lsnr = listeners[0] - self.assertEquals(Listener(self.listeners, LISTENERS[0]).__dict__, - lsnr.__dict__) + self.assertEqual(Listener(self.listeners, LISTENERS[0]).__dict__, + lsnr.__dict__) mock.assert_called_once_with( URL_TEMPLATE % (LISTENERS[0]['workbook_name'])) @@ -97,8 +97,8 @@ class TestListeners(base.BaseClientTest): lsnr = self.listeners.get(LISTENERS[0]['workbook_name'], LISTENERS[0]['id']) - self.assertEquals(Listener(self.listeners, LISTENERS[0]).__dict__, - lsnr.__dict__) + self.assertEqual(Listener(self.listeners, LISTENERS[0]).__dict__, + lsnr.__dict__) mock.assert_called_once_with( URL_TEMPLATE_ID % (LISTENERS[0]['workbook_name'], LISTENERS[0]['id'])) diff --git a/mistralclient/tests/test_tasks.py b/mistralclient/tests/test_tasks.py index 27a119aa..7b4367e0 100644 --- a/mistralclient/tests/test_tasks.py +++ b/mistralclient/tests/test_tasks.py @@ -54,7 +54,7 @@ class TestTasks(base.BaseClientTest): TASKS[0]['state']) self.assertIsNotNone(task) - self.assertEquals(Task(self.tasks, TASKS[0]).__dict__, task.__dict__) + self.assertEqual(Task(self.tasks, TASKS[0]).__dict__, task.__dict__) mock.assert_called_once_with( URL_TEMPLATE_ID % (TASKS[0]['workbook_name'], TASKS[0]['execution_id'], @@ -70,7 +70,7 @@ class TestTasks(base.BaseClientTest): self.assertEqual(1, len(tasks)) task = tasks[0] - self.assertEquals(Task(self.tasks, TASKS[0]).__dict__, task.__dict__) + self.assertEqual(Task(self.tasks, TASKS[0]).__dict__, task.__dict__) mock.assert_called_once_with( URL_TEMPLATE % (TASKS[0]['workbook_name'], TASKS[0]['execution_id'])) @@ -82,7 +82,7 @@ class TestTasks(base.BaseClientTest): TASKS[0]['execution_id'], TASKS[0]['id']) - self.assertEquals(Task(self.tasks, TASKS[0]).__dict__, task.__dict__) + self.assertEqual(Task(self.tasks, TASKS[0]).__dict__, task.__dict__) mock.assert_called_once_with( URL_TEMPLATE_ID % (TASKS[0]['workbook_name'], TASKS[0]['execution_id'], diff --git a/mistralclient/tests/test_workbooks.py b/mistralclient/tests/test_workbooks.py index 7958cf3d..58dcdf68 100644 --- a/mistralclient/tests/test_workbooks.py +++ b/mistralclient/tests/test_workbooks.py @@ -68,8 +68,8 @@ class TestWorkbooks(base.BaseClientTest): WORKBOOKS[0]['tags']) self.assertIsNotNone(wb) - self.assertEquals(Workbook(self.workbooks, WORKBOOKS[0]).__dict__, - wb.__dict__) + self.assertEqual(Workbook(self.workbooks, WORKBOOKS[0]).__dict__, + wb.__dict__) mock.assert_called_once_with(URL_TEMPLATE, json.dumps(WORKBOOKS[0])) def test_update(self): @@ -80,8 +80,8 @@ class TestWorkbooks(base.BaseClientTest): WORKBOOKS[0]['tags']) self.assertIsNotNone(wb) - self.assertEquals(Workbook(self.workbooks, WORKBOOKS[0]).__dict__, - wb.__dict__) + self.assertEqual(Workbook(self.workbooks, WORKBOOKS[0]).__dict__, + wb.__dict__) mock.assert_called_once_with( URL_TEMPLATE_NAME % WORKBOOKS[0]['name'], json.dumps(WORKBOOKS[0])) @@ -94,8 +94,8 @@ class TestWorkbooks(base.BaseClientTest): self.assertEqual(1, len(workbooks)) wb = workbooks[0] - self.assertEquals(Workbook(self.workbooks, WORKBOOKS[0]).__dict__, - wb.__dict__) + self.assertEqual(Workbook(self.workbooks, WORKBOOKS[0]).__dict__, + wb.__dict__) mock.assert_called_once_with(URL_TEMPLATE) def test_get(self): @@ -104,8 +104,8 @@ class TestWorkbooks(base.BaseClientTest): wb = self.workbooks.get(WORKBOOKS[0]['name']) self.assertIsNotNone(wb) - self.assertEquals(Workbook(self.workbooks, WORKBOOKS[0]).__dict__, - wb.__dict__) + self.assertEqual(Workbook(self.workbooks, WORKBOOKS[0]).__dict__, + wb.__dict__) mock.assert_called_once_with(URL_TEMPLATE_NAME % WORKBOOKS[0]['name']) def test_delete(self):