diff --git a/test/annotate.t b/test/annotate.t index 5a8b9aa6..11103aff 100755 --- a/test/annotate.t +++ b/test/annotate.t @@ -175,7 +175,7 @@ class TestAnnotate(TestCase): j = self.t.export() - self.assertEquals(len(j), 1) + self.assertEqual(len(j), 1) self.assertClosedInterval(j[0], expectedAnnotation="foo") def test_annotate_with_embedded_quotes(self): @@ -188,7 +188,7 @@ class TestAnnotate(TestCase): j = self.t.export() - self.assertEquals(len(j), 1) + self.assertEqual(len(j), 1) self.assertClosedInterval(j[0], expectedAnnotation='bar "foo" bar') if __name__ == "__main__": diff --git a/test/clock.t b/test/clock.t index 547615fd..2da1e189 100755 --- a/test/clock.t +++ b/test/clock.t @@ -58,7 +58,7 @@ class TestClock(TestCase): j = self.t.export() - self.assertEquals(len(j), 1) + self.assertEqual(len(j), 1) self.assertOpenInterval(j[0], expectedTags=["tag1", "tag2"]) def test_start_stop(self): @@ -74,7 +74,7 @@ class TestClock(TestCase): j = self.t.export() - self.assertEquals(len(j), 1) + self.assertEqual(len(j), 1) self.assertClosedInterval(j[0], expectedTags=["tag1", "tag2"]) code, out, err = self.t.runError("") @@ -94,7 +94,7 @@ class TestClock(TestCase): j = self.t.export() - self.assertEquals(len(j), 2) + self.assertEqual(len(j), 2) self.assertClosedInterval(j[0], expectedTags=["tag1", "tag2"]) self.assertOpenInterval(j[1], expectedTags=["tag3"]) diff --git a/test/help.t b/test/help.t index ef9bc06f..eb53fe1c 100755 --- a/test/help.t +++ b/test/help.t @@ -50,13 +50,13 @@ class TestHelp(TestCase): """timew --help should print usage""" code, out1, err1 = self.t("help") code, out2, err2 = self.t("--help") - self.assertEquals(out1, out2) + self.assertEqual(out1, out2) def test_help_short_option_should_print_usage(self): """timew -h should print usage""" code, out1, err1 = self.t("help") code, out2, err2 = self.t("-h") - self.assertEquals(out1, out2) + self.assertEqual(out1, out2) def test_help_with_command_should_show_man_page(self): """timew help with command should show man page""" @@ -75,13 +75,13 @@ class TestHelp(TestCase): """timew command with --help should show help page""" code, out1, err1 = self.t("help track") code, out2, err2 = self.t("track --help") - self.assertEquals(out1, out2) + self.assertEqual(out1, out2) def test_command_with_help_short_option_should_show_help_page(self): """timew command with -h should show help page""" code, out1, err1 = self.t("help track") code, out2, err2 = self.t("track -h") - self.assertEquals(out1, out2) + self.assertEqual(out1, out2) if __name__ == "__main__": diff --git a/test/modify.t b/test/modify.t index 543eae1c..1fc2b870 100755 --- a/test/modify.t +++ b/test/modify.t @@ -60,7 +60,7 @@ class TestModify(TestCase): code, out, err = self.t("modify start @1 {:%Y-%m-%dT%H:%M:%S}Z".format(one_hour_before_utc)) j = self.t.export() - self.assertEquals(len(j), 1) + self.assertEqual(len(j), 1) self.assertOpenInterval(j[0], expectedStart="{:%Y%m%dT%H%M%S}Z".format(one_hour_before_utc)) @@ -96,7 +96,7 @@ class TestModify(TestCase): code, out, err = self.t("modify end @2 {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=2))) j = self.t.export() - self.assertEquals(len(j), 2) + self.assertEqual(len(j), 2) self.assertClosedInterval(j[0], expectedStart="{:%Y%m%dT%H%M%S}Z".format(now_utc - timedelta(hours=3)), expectedEnd="{:%Y%m%dT%H%M%S}Z".format(now_utc - timedelta(hours=2))) @@ -137,7 +137,7 @@ class TestModify(TestCase): code, out, err = self.t("modify start @2 {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=2))) j = self.t.export() - self.assertEquals(len(j), 2) + self.assertEqual(len(j), 2) self.assertClosedInterval(j[0], expectedStart="{:%Y%m%dT%H%M%S}Z".format(now_utc - timedelta(hours=2)), expectedEnd="{:%Y%m%dT%H%M%S}Z".format(now_utc - timedelta(hours=1))) diff --git a/test/move.t b/test/move.t index df246f88..576632fb 100755 --- a/test/move.t +++ b/test/move.t @@ -116,7 +116,7 @@ class TestMove(TestCase): j = self.t.export() - self.assertEquals(len(j), 2) + self.assertEqual(len(j), 2) self.assertClosedInterval(j[0], expectedStart="20170301T110000Z", expectedEnd="20170301T133000Z", diff --git a/test/tag.t b/test/tag.t index c532d1d5..d9dc35ec 100755 --- a/test/tag.t +++ b/test/tag.t @@ -217,7 +217,7 @@ class TestTag(TestCase): j = self.t.export() - self.assertEquals(len(j), 1) + self.assertEqual(len(j), 1) self.assertClosedInterval(j[0], expectedTags=["foo"]) def test_tag_with_new_tag(self): diff --git a/test/untag.t b/test/untag.t index 953c144f..4af542ac 100755 --- a/test/untag.t +++ b/test/untag.t @@ -216,7 +216,7 @@ class TestUntag(TestCase): j = self.t.export() - self.assertEquals(len(j), 1) + self.assertEqual(len(j), 1) self.assertClosedInterval(j[0], expectedTags=["bar"])