From cfd45ffcda4f0141676a9547ad58f9b22a06be12 Mon Sep 17 00:00:00 2001 From: Simon de Haan Date: Thu, 23 Oct 2014 09:11:02 +0200 Subject: [PATCH] test does not highlight the problem --- elasticgit/tests/test_workspace.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/elasticgit/tests/test_workspace.py b/elasticgit/tests/test_workspace.py index 4473057..3e4bc6f 100644 --- a/elasticgit/tests/test_workspace.py +++ b/elasticgit/tests/test_workspace.py @@ -196,15 +196,10 @@ def test_fast_forward(self): 'age': 1, 'name': 'Name', }) - person2 = TestPerson({ - 'age': 2, - 'name': 'Foo', - }) self.upstream_workspace = self.mk_workspace( name='%s-upstream' % (self.id().lower())) self.upstream_workspace.save(person1, 'Saving upstream 1') - self.upstream_workspace.save(person2, 'Saving upstream 2') repo = self.workspace.repo repo.create_remote( @@ -215,7 +210,7 @@ def test_fast_forward(self): self.workspace.fast_forward() self.workspace.reindex(TestPerson) self.assertEqual( - self.workspace.S(TestPerson).count(), 2) + self.workspace.S(TestPerson).count(), 1) def test_fast_forward_with_multiple_remotes(self): person = TestPerson({