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

- minor fixes

Browse Source
This commit is contained in:
Marcus Huewe 2010-08-25 11:29:17 +02:00
parent 62dc807378
commit e21e61f20e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_deletefiles.py
View File

@ -76,7 +76,7 @@ class TestDeleteFiles(OscTestCase):
self.assertTrue(os.path.exists('foo'))
self.assertTrue(os.path.exists(os.path.join('.osc', 'foo')))
self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted')))
self.assertTrue(os.path.exists(os.path.join('.osc', '_in_conflict')))
self._check_conflictlist('foo\n')
self._check_status(p, 'foo', 'C')
def testDeleteModifiedForce(self):

1
tests/test_update.py
View File

@ -92,6 +92,7 @@ class TestUpdate(OscTestCase):
osc.core.Package('.').update(rev=2)
exp = 'skipping \'merge\' (this is due to conflicts)\nAt revision 2.\n'
self.assertEqual(sys.stdout.getvalue(), exp)
self._check_conflictlist('merge\n')
self.__check_digests('testUpdateAlreadyInConflict_files')
@GET('http://localhost/source/osctest/deleted?rev=2', file='testUpdateLocalDeletions_files')