Python calculate_merge Examples

Example #1

 def test_change_client(self):
     new_tree, conflict = calculate_merge(set([f1, f2]), set([f1, f2a]),
                                          set([f1, f2]))
     self.assertEqual(new_tree, {'file_1': f1, 'file_2': f2a})
     self.assertEqual(conflict, set())

Example #2

 def test_add_conflict_but_identical(self):
     new_tree, conflict = calculate_merge(set([f1]), set([f1, f2a]),
                                          set([f1, f2a]))
     self.assertEqual(new_tree, {'file_1': f1, 'file_2': f2a})
     self.assertEqual(conflict, set([f2a]))

Example #3

 def test_remove_both(self):
     new_tree, conflict = calculate_merge(set([f1, f2]), set([f1]),
                                          set([f1]))
     self.assertEqual(new_tree, {'file_1': f1})
     self.assertEqual(conflict, set())

Example #4

 def test_no_changes(self):
     new_tree, conflict = calculate_merge(set([f1]), set([f1]), set([f1]))
     self.assertEqual(new_tree, {'file_1': f1})
     self.assertEqual(conflict, set())

Example #5

 def test_add_both(self):
     new_tree, conflict = calculate_merge(set([f1]), set([f1, f2]),
                                          set([f1, f3]))
     self.assertEqual(new_tree, {'file_1': f1, 'file_2': f2, 'file_3': f3})
     self.assertEqual(conflict, set())

Example #6

 def test_blank(self):
     new_tree, conflict = calculate_merge(set(), set(), set())
     self.assertEqual(new_tree, {})
     self.assertEqual(conflict, set())

Example #7

 def test_only_server(self):
     new_tree, conflict = calculate_merge(set(), set(), set([f1, f2]))
     self.assertEqual(new_tree, {'file_1': f1, 'file_2': f2})
     self.assertEqual(conflict, set())

Example #8

File: test_merge.py Project: goldenboy/MagicFolder

 def test_remove_both(self):
     new_tree, conflict = calculate_merge(
                 set([f1, f2]), set([f1]), set([f1]))
     self.assertEqual(new_tree, {'file_1': f1})
     self.assertEqual(conflict, set())

Example #9

File: test_merge.py Project: goldenboy/MagicFolder

 def test_change_client(self):
     new_tree, conflict = calculate_merge(
                 set([f1, f2]), set([f1, f2a]), set([f1, f2]))
     self.assertEqual(new_tree, {'file_1': f1, 'file_2': f2a})
     self.assertEqual(conflict, set())

Example #10

File: test_merge.py Project: goldenboy/MagicFolder

 def test_add_conflict_but_identical(self):
     new_tree, conflict = calculate_merge(
                 set([f1]), set([f1, f2a]), set([f1, f2a]))
     self.assertEqual(new_tree, {'file_1': f1, 'file_2': f2a})
     self.assertEqual(conflict, set([f2a]))

Example #11

File: test_merge.py Project: goldenboy/MagicFolder

 def test_add_both(self):
     new_tree, conflict = calculate_merge(
                 set([f1]), set([f1, f2]), set([f1, f3]))
     self.assertEqual(new_tree, {'file_1': f1, 'file_2': f2, 'file_3': f3})
     self.assertEqual(conflict, set())

Example #12

File: test_merge.py Project: goldenboy/MagicFolder

 def test_no_changes(self):
     new_tree, conflict = calculate_merge(
                 set([f1]), set([f1]), set([f1]))
     self.assertEqual(new_tree, {'file_1': f1})
     self.assertEqual(conflict, set())

Example #13

File: test_merge.py Project: goldenboy/MagicFolder

 def test_only_server(self):
     new_tree, conflict = calculate_merge(set(), set(), set([f1, f2]))
     self.assertEqual(new_tree, {'file_1': f1, 'file_2': f2})
     self.assertEqual(conflict, set())

Example #14

File: test_merge.py Project: goldenboy/MagicFolder

 def test_blank(self):
     new_tree, conflict = calculate_merge(set(), set(), set())
     self.assertEqual(new_tree, {})
     self.assertEqual(conflict, set())