diff --git a/tests/difffile_fixtures/osctest/replaced/.osc/_in_conflict b/tests/difffile_fixtures/osctest/replaced/.osc/_in_conflict deleted file mode 100644 index 257cc564..00000000 --- a/tests/difffile_fixtures/osctest/replaced/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_to_be_deleted b/tests/difffile_fixtures/osctest/simple/.osc/_to_be_deleted index 98b0eecc..ebf038b9 100644 --- a/tests/difffile_fixtures/osctest/simple/.osc/_to_be_deleted +++ b/tests/difffile_fixtures/osctest/simple/.osc/_to_be_deleted @@ -1,2 +1 @@ somefile -modified diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_files b/tests/revertfile_fixtures/osctest/simple/.osc/_files index b771c18d..5dbd5763 100644 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_files +++ b/tests/revertfile_fixtures/osctest/simple/.osc/_files @@ -5,5 +5,6 @@ + diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted b/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted index 98b0eecc..08f95e52 100644 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted +++ b/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted @@ -1,2 +1,2 @@ somefile -modified +deleted diff --git a/tests/test_revertfiles.py b/tests/test_revertfiles.py index 474273cf..d2e97708 100644 --- a/tests/test_revertfiles.py +++ b/tests/test_revertfiles.py @@ -44,7 +44,7 @@ class TestRevertFiles(OscTestCase): p = osc.core.Package('.') p.revert('somefile') self.__check_file('somefile') - self._check_deletelist('modified\n') + self._check_deletelist('deleted\n') self._check_status(p, 'somefile', ' ') def testRevertMissing(self): diff --git a/tests/test_update.py b/tests/test_update.py index c60d7659..27c1c624 100644 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -263,7 +263,6 @@ class TestUpdate(OscTestCase): self.assertFalse(os.path.exists(os.path.join('.osc', '_in_update'))) self._check_digests('testUpdateResume_files') - @GET('http://localhost/source/osctest/simple/added?rev=1', file='testUpdateResumeDeletedFile_foo') @GET('http://localhost/source/osctest/simple/foo?rev=1', file='testUpdateResumeDeletedFile_foo') @GET('http://localhost/source/osctest/simple/merge?rev=1', file='testUpdateResumeDeletedFile_merge') @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml') diff --git a/tests/update_fixtures/osctest/resume/.osc/_files b/tests/update_fixtures/osctest/resume/.osc/_files index f0dac1f4..e4f249e6 100644 --- a/tests/update_fixtures/osctest/resume/.osc/_files +++ b/tests/update_fixtures/osctest/resume/.osc/_files @@ -1,5 +1,6 @@ + - \ No newline at end of file + diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_files b/tests/update_fixtures/osctest/resume_deleted/.osc/_files index 26ba69da..57961368 100644 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_files +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_files @@ -1,5 +1,5 @@ - +