mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

- adjust testcase for commit 9205d4d902cd3d45747c30405acd92bd5f98d210

Browse Source
This commit is contained in:
Marcus Huewe 2010-08-23 18:29:09 +02:00
parent d5e4a81e8f
commit a6efd9e970
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_update.py
View File

@ -272,6 +272,7 @@ class TestUpdate(unittest.TestCase):
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')
@ -288,6 +289,8 @@ class TestUpdate(unittest.TestCase):
exp = 'resuming broken update...\nD added\nU foo\nU merge\nAt revision 1.\nAt revision 1.\n'
self.assertEqual(sys.stdout.getvalue(), exp)
self.assertFalse(os.path.exists(os.path.join('.osc', '_in_update')))
self.assertFalse(os.path.exists('added'))
self.assertFalse(os.path.exists(os.path.join('.osc', 'added')))
self.__check_digests('testUpdateResumeDeletedFile_files')
def __expected_requests(self, *args):

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

@ -1,6 +1,6 @@
<directory name="simple" rev="5" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="5">
<directory name="simple" rev="1" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="1">
<entry md5="ff22941336956098ae9a564289d1bf1b" 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" />
</directory>
</directory>