mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-07 13:48:43 +02:00
Code Activity

- update: support special handling for _service: files

Browse Source
This commit is contained in:
Marcus Huewe
2010-08-23 14:56:50 +02:00
parent 63df61e452
commit d8c59c8438
17 changed files with 95 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/test_update.py
View File

@@ -233,6 +233,29 @@ class TestUpdate(unittest.TestCase):
self.__check_digests('testUpdateLimitSizeAddDelete_files', 'bigfile', 'foo', 'merge', 'nochange')
@GET('http://localhost/source/osctest/services?rev=latest', file='testUpdateServiceFilesAddDelete_filesremote')
@GET('http://localhost/source/osctest/services/bigfile?rev=2', file='testUpdateServiceFilesAddDelete_bigfile')
@GET('http://localhost/source/osctest/services/_service%3Abar?rev=2', file='testUpdateServiceFilesAddDelete__service:bar')
@GET('http://localhost/source/osctest/services/_service%3Afoo?rev=2', file='testUpdateServiceFilesAddDelete__service:foo')
@GET('http://localhost/source/osctest/services/_meta', file='meta.xml')
def testUpdateAddDeleteServiceFiles(self):
"""
a new file was added to the remote package but isn't checked out because
of the size constraint
"""
self.__change_to_pkg('services')
osc.core.Package('.').update(service_files=True)
exp = 'A bigfile\nD _service:exists\nA _service:bar\nA _service:foo\nAt revision 2.\n'
self.assertEqual(sys.stdout.getvalue(), exp)
self.assertFalse(os.path.exists(os.path.join('.osc', '_service:bar')))
self.assertTrue(os.path.exists('_service:bar'))
self.assertEqual(open('_service:bar').read(), 'another service\n')
self.assertFalse(os.path.exists(os.path.join('.osc', '_service:foo')))
self.assertTrue(os.path.exists('_service:foo'))
self.assertEqual(open('_service:foo').read(), 'small\n')
self.assertTrue(os.path.exists('_service:exists'))
self.__check_digests('testUpdateServiceFilesAddDelete_files', '_service:foo', '_service:bar')
# tests to recover from an aborted/broken update
@GET('http://localhost/source/osctest/simple/foo?rev=2', file='testUpdateResume_foo')

1
tests/update_fixtures/osctest/services/.osc/_apiurl Normal file
View File

@@ -0,0 +1 @@
http://localhost

5
tests/update_fixtures/osctest/services/.osc/_files Normal file
View File

@@ -0,0 +1,5 @@
<directory name="foo" rev="1" srcmd5="b9f060f4b3640e58a1d44abc25ffb9bd" vrev="1">
<entry md5="7b1458c733a187d4f3807665ddd02cca" mtime="1282565027" name="_service:exists" size="20" skipped="true" />
<entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" />
<entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" />
</directory>

1
tests/update_fixtures/osctest/services/.osc/_osclib_version Normal file
View File

@@ -0,0 +1 @@
1.0

1
tests/update_fixtures/osctest/services/.osc/_package Normal file
View File

@@ -0,0 +1 @@
services

1
tests/update_fixtures/osctest/services/.osc/_project Normal file
View File

@@ -0,0 +1 @@
osctest

1
tests/update_fixtures/osctest/services/.osc/foo Normal file
View File

@@ -0,0 +1 @@
This is a simple test.

4
tests/update_fixtures/osctest/services/.osc/merge Normal file
View File

@@ -0,0 +1,4 @@
Is it
possible to
merge this file?
I hope so...

2
tests/update_fixtures/osctest/services/_service:exists Normal file
View File

@@ -0,0 +1,2 @@
another service
foo

1
tests/update_fixtures/osctest/services/foo Normal file
View File

@@ -0,0 +1 @@
This is a simple test.

4
tests/update_fixtures/osctest/services/merge Normal file
View File

@@ -0,0 +1,4 @@
Is it
possible to
merge this file?
I hope so...

1
tests/update_fixtures/testUpdateServiceFilesAddDelete__service:bar Normal file
View File

@@ -0,0 +1 @@
another service

1
tests/update_fixtures/testUpdateServiceFilesAddDelete__service:foo Normal file
View File

@@ -0,0 +1 @@
small

5
tests/update_fixtures/testUpdateServiceFilesAddDelete_bigfile Normal file
View File

@@ -0,0 +1,5 @@
This is a file
with a lot of
text. Foo foo
bar bar bar.
foobarfoobar

7
tests/update_fixtures/testUpdateServiceFilesAddDelete_files Normal file
View File

@@ -0,0 +1,7 @@
<directory name="foo" rev="2" srcmd5="1c5d541a029694c43d5341cabcb4f40f" vrev="2">
<entry md5="a0106bad78c9070662d5cde42ee35f23" mtime="1282564656" name="_service:bar" size="16" skipped="true" />
<entry md5="d15dbfcb847653913855e21370d83af1" mtime="1282561867" name="_service:foo" size="6" skipped="true" />
<entry md5="ed955c917012307d982b7cdd5799ff1a" mtime="1282320398" name="bigfile" size="69" />
<entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" />
<entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" />
</directory>

7
tests/update_fixtures/testUpdateServiceFilesAddDelete_filesremote Normal file
View File

@@ -0,0 +1,7 @@
<directory name="foo" rev="2" vrev="2" srcmd5="1c5d541a029694c43d5341cabcb4f40f">
<entry name="_service:bar" md5="a0106bad78c9070662d5cde42ee35f23" size="16" mtime="1282564656" />
<entry name="_service:foo" md5="d15dbfcb847653913855e21370d83af1" size="6" mtime="1282561867" />
<entry name="bigfile" md5="ed955c917012307d982b7cdd5799ff1a" size="69" mtime="1282320398" />
<entry name="foo" md5="0d62ceea6020d75154078a20d8c9f9ba" size="23" mtime="1282320303" />
<entry name="merge" md5="17b9e9e1a032ed44e7a584dc6303ffa8" size="48" mtime="1282320303" />
</directory>