From f7c036ab52c9fad0492c8839908aaa2288c5a9cb Mon Sep 17 00:00:00 2001 From: Vassilii Khachaturov Date: Sun, 15 Sep 2013 14:43:30 +0000 Subject: [PATCH] 7027: skip tests blocked by this bug svn: r23137 --- gramps/gen/lib/test/merge_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gramps/gen/lib/test/merge_test.py b/gramps/gen/lib/test/merge_test.py index 8dc5a0e22..9a3054394 100644 --- a/gramps/gen/lib/test/merge_test.py +++ b/gramps/gen/lib/test/merge_test.py @@ -1545,6 +1545,7 @@ class SourceCheck(unittest.TestCase, PrivacyBaseTest, NoteBaseTest, def todo_test_replace(self): pass + @unittest.skip("Blocked by BUG# 7027") def test_merge_datamap(self): self.phoenix.set_data_item('A', 'a') self.phoenix.set_data_item('B', 'b') @@ -1735,6 +1736,7 @@ class CitationCheck(unittest.TestCase, PrivacyBaseTest, MediaBaseTest, self.phoenix.merge(self.titanic) self.assertEqual(self.phoenix.serialize(), self.ref_obj.serialize()) + @unittest.skip("Blocked by BUG# 7027") def test_merge_datamap(self): self.phoenix.set_data_item('A', 'a') self.phoenix.set_data_item('B', 'b')