diff --git a/test/annotate.t b/test/annotate.t index 48c9b9b2..11103aff 100755 --- a/test/annotate.t +++ b/test/annotate.t @@ -139,7 +139,6 @@ class TestAnnotate(TestCase): def test_annotate_synthetic_interval(self): """Annotate a synthetic interval.""" now = datetime.now() - day_before = now - timedelta(days=1) three_hours_before = now - timedelta(hours=3) four_hours_before = now - timedelta(hours=4) @@ -149,25 +148,19 @@ class TestAnnotate(TestCase): five_hours_before_utc = now_utc - timedelta(hours=5) self.t.configure_exclusions((four_hours_before.time(), three_hours_before.time())) - self.t("track {:%Y-%m-%dT%H:%M:%S}Z - {:%Y-%m-%dT%H:%M:%S}Z foo".format(day_before, day_before + timedelta(hours=1))) self.t("start {:%Y-%m-%dT%H:%M:%S}Z foo".format(five_hours_before_utc)) - self.t("annotate @3 @2 bar") + self.t("annotate @2 bar") j = self.t.export() - self.assertEqual(len(j), 3) + self.assertEqual(len(j), 2) self.assertClosedInterval(j[0], - expectedStart="{:%Y%m%dT%H%M%S}Z".format(day_before), - expectedEnd="{:%Y%m%dT%H%M%S}Z".format(day_before + timedelta(hours=1)), - expectedAnnotation="bar", - description="modified interval") - self.assertClosedInterval(j[1], expectedStart="{:%Y%m%dT%H%M%S}Z".format(five_hours_before_utc), expectedEnd="{:%Y%m%dT%H%M%S}Z".format(four_hours_before_utc), expectedAnnotation="bar", description="modified interval") - self.assertOpenInterval(j[2], + self.assertOpenInterval(j[1], expectedStart="{:%Y%m%dT%H%M%S}Z".format(three_hours_before_utc), expectedAnnotation="", description="unmodified interval") diff --git a/test/move.t b/test/move.t index 29562f3f..96d13b68 100755 --- a/test/move.t +++ b/test/move.t @@ -133,70 +133,25 @@ class TestMove(TestCase): four_hours_before = now - timedelta(hours=4) now_utc = now.utcnow() - day_before = now_utc - timedelta(days=1) three_hours_before_utc = now_utc - timedelta(hours=3) four_hours_before_utc = now_utc - timedelta(hours=4) five_hours_before_utc = now_utc - timedelta(hours=5) self.t.configure_exclusions((four_hours_before.time(), three_hours_before.time())) - # Place a non-synthetic interval in the history - self.t("start {:%Y-%m-%dT%H:%M:%S}Z bar".format(day_before)) - self.t("stop {:%Y-%m-%dT%H:%M:%S}Z".format(day_before + timedelta(minutes=30))) - self.t("start {:%Y-%m-%dT%H:%M:%S}Z foo".format(five_hours_before_utc)) - j = self.t.export() - - self.assertEqual(len(j), 3) - self.assertClosedInterval(j[0], - expectedStart=day_before, - expectedEnd=day_before + timedelta(minutes=30), - expectedTags=[], - description="unmodified interval") - self.assertClosedInterval(j[1], - expectedStart=five_hours_before_utc, - expectedEnd=four_hours_before_utc, - expectedTags=[], - description="unmodified interval") - self.assertOpenInterval(j[2], - expectedStart=three_hours_before_utc, - expectedTags=[], - description="unmodified interval") - - # First move the non-synthetic one - self.t("move @3 {:%Y-%m-%dT%H:%M:%S}Z".format(day_before + timedelta(minutes=30))) - - j = self.t.export() - - self.assertEqual(len(j), 3) - self.assertClosedInterval(j[0], - expectedStart=day_before + timedelta(minutes=30), - expectedEnd=day_before + timedelta(hours=1), - expectedTags=[], - description="moved interval") - self.assertClosedInterval(j[1], - expectedStart=five_hours_before_utc, - expectedEnd=four_hours_before_utc, - expectedTags=[], - description="unmodified interval") - self.assertOpenInterval(j[2], - expectedStart=three_hours_before_utc, - expectedTags=[], - description="unmodified interval") - - # Then move the synthetic one self.t("move @2 {:%Y-%m-%dT%H:%M:%S}Z".format(five_hours_before_utc + timedelta(minutes=20))) j = self.t.export() - self.assertEqual(len(j), 3) - self.assertClosedInterval(j[1], + self.assertEqual(len(j), 2) + self.assertClosedInterval(j[0], expectedStart=five_hours_before_utc + timedelta(minutes=20), expectedEnd=four_hours_before_utc + timedelta(minutes=20), expectedTags=[], description="moved interval") - self.assertOpenInterval(j[2], + self.assertOpenInterval(j[1], expectedStart=three_hours_before_utc, expectedTags=[], description="unmodified interval")