From 52cf1efd8b1f721d65732d16b171040d83d02b21 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 13 Sep 2017 20:03:33 +0300 Subject: [PATCH] tests: fix test_workflow Signed-off-by: Ruslan Kuprieiev --- tests/test_workflow.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/test_workflow.py b/tests/test_workflow.py index e497a9f3f..45b77ea26 100644 --- a/tests/test_workflow.py +++ b/tests/test_workflow.py @@ -27,10 +27,14 @@ class TestWorkflow(TestCase): self.assertEqual(len(wf._commits), 4) - self.assertEqual(wf._commits['1'].text, self._commit1._comment + '\n' + self._commit1.hash) - self.assertEqual(wf._commits['2'].text, self._commit2._comment + '\n' + self._commit2.hash) - self.assertEqual(wf._commits['3'].text, self._commit3._comment + '\n' + self._commit3.hash) - self.assertEqual(wf._commits['4'].text, self._commit4._comment + '\n' + self._commit4.hash) + self.assertEqual(wf._commits['1'].text, + self._commit1._comment + '\n' + self._commit1._text_hash()) + self.assertEqual(wf._commits['2'].text, + self._commit2._comment + '\n' + self._commit2._text_hash()) + self.assertEqual(wf._commits['3'].text, + self._commit3._comment + '\n' + self._commit3._text_hash()) + self.assertEqual(wf._commits['4'].text, + self._commit4._comment + '\n' + self._commit4._text_hash()) pass def collapse_test(self): @@ -43,7 +47,8 @@ class TestWorkflow(TestCase): wf.collapse_repro_commits() self.assertEqual(len(wf._commits), 3) - self.assertEqual(wf._commits[self._commit1.hash].text, self._commit1._comment + '\n' + self._commit1.hash) + self.assertEqual(wf._commits[self._commit1.hash].text, + self._commit1._comment + '\n' + self._commit1._text_hash()) self.assertEqual(wf._commits[self._commit3.hash].text, Commit.COLLAPSED_TEXT) self.assertTrue('2' not in wf._commits) @@ -61,7 +66,8 @@ class TestWorkflow(TestCase): wf.collapse_repro_commits() self.assertEqual(len(wf._commits), 2) - self.assertEqual(wf._commits[self._commit1.hash].text, self._commit1._comment + '\n' + self._commit1.hash) + self.assertEqual(wf._commits[self._commit1.hash].text, + self._commit1._comment + '\n' + self._commit1._text_hash()) self.assertEqual(wf._commits[self._commit3.hash].text, Commit.COLLAPSED_TEXT) self.assertTrue('2' not in wf._commits) pass @@ -83,4 +89,4 @@ class TestWorkflow(TestCase): self.assertEqual(wf._commits['3']._target_metric, value) self.assertEqual(wf._commits['3'].branch_tips, branches) - pass \ No newline at end of file + pass