mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-12 16:56:15 +01:00
Code

- cleanup working copies...

Browse Source
This commit is contained in:
Marcus Huewe 2010-09-08 16:18:35 +02:00
parent 7fb1d22593
commit fdcfd5e315
8 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/difffile_fixtures/osctest/replaced/.osc/_in_conflict
View File

@ -1 +0,0 @@
foo

1
tests/difffile_fixtures/osctest/simple/.osc/_to_be_deleted
View File

@ -1,2 +1 @@
somefile
modified

1
tests/revertfile_fixtures/osctest/simple/.osc/_files
View File

@ -5,5 +5,6 @@
<entry md5="eb9c2bf0eb63f3a7bc0ea37ef18aeba5" mtime="1282730880" name="somefile" size="13" />
<entry md5="81be947db54c2e225dc8eacce64d8a4a" mtime="1282731457" name="replaced" size="17" />
<entry md5="676513fde5797c3785164942c97dfec1" mtime="1282731738" name="missing" size="8" />
<entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="deleted" size="9" />
<entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="12" skipped="true" />
</directory>

2
tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted
View File

@ -1,2 +1,2 @@
somefile
modified
deleted

2
tests/test_revertfiles.py
View File

@ -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):

1
tests/test_update.py
View File

@ -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')

3
tests/update_fixtures/osctest/resume/.osc/_files
View File

@ -1,5 +1,6 @@
<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1">
<entry md5="ff22941336956098ae9a564289d1bf1b" mtime="1282137256" name="added" size="15" />
<entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" />
<entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" />
<entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />
</directory>
</directory>

2
tests/update_fixtures/osctest/resume_deleted/.osc/_files
View File

@ -1,5 +1,5 @@
<directory name="simple" rev="1" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="1">
<entry md5="ff22941336956098ae9a564289d1bf1b" mtime="1282137256" name="added" size="15" />
<entry md5="d41d8cd98f00b204e9800998ecf8427e" mtime="1282137256" name="added" size="15" />
<entry md5="14758f1afd44c09b7992073ccf00b43d" mtime="1282137220" name="foo" size="7" />
<entry md5="256d8f76ba7a0a231fb46a84866f25d8" mtime="1282137238" name="merge" size="20" />
<entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" />