diff options
Diffstat (limited to 'Tools/QueueStatusServer/model')
| -rw-r--r-- | Tools/QueueStatusServer/model/queuepropertymixin_unittest.py | 6 | ||||
| -rw-r--r-- | Tools/QueueStatusServer/model/queues_unittest.py | 6 | ||||
| -rw-r--r-- | Tools/QueueStatusServer/model/workitems_unittest.py | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Tools/QueueStatusServer/model/queuepropertymixin_unittest.py b/Tools/QueueStatusServer/model/queuepropertymixin_unittest.py index 9a301fee7..e83c3f50d 100644 --- a/Tools/QueueStatusServer/model/queuepropertymixin_unittest.py +++ b/Tools/QueueStatusServer/model/queuepropertymixin_unittest.py @@ -42,10 +42,10 @@ class QueuePropertyMixinTest(unittest.TestCase): test_object = ObjectWithQueueName() mac_ews = Queue("mac-ews") test_object.queue = mac_ews - self.assertEquals(test_object.queue.name(), "mac-ews") - self.assertEquals(test_object.queue_name, "mac-ews") + self.assertEqual(test_object.queue.name(), "mac-ews") + self.assertEqual(test_object.queue_name, "mac-ews") test_object.queue = None - self.assertEquals(test_object.queue_name, None) + self.assertEqual(test_object.queue_name, None) if __name__ == '__main__': diff --git a/Tools/QueueStatusServer/model/queues_unittest.py b/Tools/QueueStatusServer/model/queues_unittest.py index cfa7fcdd2..654c8a62b 100644 --- a/Tools/QueueStatusServer/model/queues_unittest.py +++ b/Tools/QueueStatusServer/model/queues_unittest.py @@ -43,7 +43,7 @@ class QueueTest(unittest.TestCase): self.assertRaises(AssertionError, Queue, ("bogus")) def _assert_short_name(self, queue_name, short_name): - self.assertEquals(Queue(queue_name).short_name(), short_name) + self.assertEqual(Queue(queue_name).short_name(), short_name) def test_short_name(self): self._assert_short_name("mac-ews", "Mac") @@ -52,7 +52,7 @@ class QueueTest(unittest.TestCase): self._assert_short_name("style-queue", "Style") def _assert_display_name(self, queue_name, short_name): - self.assertEquals(Queue(queue_name).display_name(), short_name) + self.assertEqual(Queue(queue_name).display_name(), short_name) def test_display_name(self): self._assert_display_name("mac-ews", "Mac EWS") @@ -61,7 +61,7 @@ class QueueTest(unittest.TestCase): self._assert_display_name("style-queue", "Style Queue") def _assert_name_with_underscores(self, queue_name, short_name): - self.assertEquals(Queue(queue_name).name_with_underscores(), short_name) + self.assertEqual(Queue(queue_name).name_with_underscores(), short_name) def test_name_with_underscores(self): self._assert_name_with_underscores("mac-ews", "mac_ews") diff --git a/Tools/QueueStatusServer/model/workitems_unittest.py b/Tools/QueueStatusServer/model/workitems_unittest.py index b1ff1d315..f6ca78559 100644 --- a/Tools/QueueStatusServer/model/workitems_unittest.py +++ b/Tools/QueueStatusServer/model/workitems_unittest.py @@ -36,9 +36,9 @@ class WorkItemsTest(unittest.TestCase): def test_display_position_for_attachment(self): items = WorkItems() items.item_ids = [0, 1, 2] - self.assertEquals(items.display_position_for_attachment(0), 1) - self.assertEquals(items.display_position_for_attachment(1), 2) - self.assertEquals(items.display_position_for_attachment(3), None) + self.assertEqual(items.display_position_for_attachment(0), 1) + self.assertEqual(items.display_position_for_attachment(1), 2) + self.assertEqual(items.display_position_for_attachment(3), None) if __name__ == '__main__': |