mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-05 20:58:42 +02:00
Code Activity

- moved common methods into the OscTestCase class

Browse Source
This commit is contained in:
Marcus Huewe
2010-08-25 11:20:25 +02:00
parent 3fefbfbc5f
commit 62dc807378
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_update.py
View File

@@ -79,7 +79,7 @@ class TestUpdate(OscTestCase):
exp = 'C merge\nAt revision 2.\n'
self.__check_digests('testUpdateConflict_files')
self.assertEqual(sys.stdout.getvalue(), exp)
self.assertEqual(open(os.path.join('.osc', '_in_conflict'), 'r').read(), 'merge\n')
self._check_conflictlist('merge\n')
@GET('http://localhost/source/osctest/already_in_conflict?rev=2', file='testUpdateAlreadyInConflict_files')
@GET('http://localhost/source/osctest/already_in_conflict/merge?rev=2', file='testUpdateAlreadyInConflict_merge')
@@ -109,8 +109,8 @@ class TestUpdate(OscTestCase):
osc.core.Package('.').update(rev=2)
exp = 'U foo\nC merge\nAt revision 2.\n'
self.assertEqual(sys.stdout.getvalue(), exp)
self.assertEqual(open(os.path.join('.osc', '_to_be_deleted'), 'r').read(), 'foo\n')
self.assertEqual(open(os.path.join('.osc', '_in_conflict'), 'r').read(), 'merge\n')
self._check_deletelist('foo\n')
self._check_conflictlist('merge\n')
self.assertEqual(open('foo', 'r').read(), open(os.path.join('.osc', 'foo'), 'r').read())
self.__check_digests('testUpdateLocalDeletions_files')