diff options
| author | shuai.fu <shuai01.fu@samsung.com> | 2016-05-25 15:06:41 +0800 |
|---|---|---|
| committer | shuai.fu <shuai01.fu@samsung.com> | 2016-05-25 15:46:01 +0800 |
| commit | 1e53d47fe9188215e3d067e171515a82437cd662 (patch) | |
| tree | d635d02be4241ddfcadead1ce283b8bcd8e6f30a /tests/update_fixtures | |
| parent | 24c5a368546ade2816e32c8f85036af666e49453 (diff) | |
| download | osc-1e53d47fe9188215e3d067e171515a82437cd662.tar.gz osc-1e53d47fe9188215e3d067e171515a82437cd662.tar.bz2 osc-1e53d47fe9188215e3d067e171515a82437cd662.zip | |
Update version to 0.153 (equel to github version is 0.152)upstream/0.153.0release-20160930release-20160615release-20160531
Change-Id: I5bc643eaf2c3e4fa897ba5d2c6ec4e486232d106
Signed-off-by: shuai.fu <shuai01.fu@samsung.com>
Diffstat (limited to 'tests/update_fixtures')
186 files changed, 548 insertions, 0 deletions
diff --git a/tests/update_fixtures/meta.xml b/tests/update_fixtures/meta.xml new file mode 100644 index 0000000..abd3720 --- /dev/null +++ b/tests/update_fixtures/meta.xml @@ -0,0 +1,8 @@ +<package project="osctest" name="simple"> + <title/> + <description> + + </description> + <person userid="Admin" role="maintainer"/> + <person userid="Admin" role="bugowner"/> +</package>
\ No newline at end of file diff --git a/tests/update_fixtures/oscrc b/tests/update_fixtures/oscrc new file mode 100644 index 0000000..a30e040 --- /dev/null +++ b/tests/update_fixtures/oscrc @@ -0,0 +1,103 @@ +[general] +# URL to access API server, e.g. https://api.opensuse.org +# you also need a section [https://api.opensuse.org] with the credentials +apiurl = http://localhost +# Downloaded packages are cached here. Must be writable by you. +#packagecachedir = /var/tmp/osbuild-packagecache +# Wrapper to call build as root (sudo, su -, ...) +#su-wrapper = su -c +# rootdir to setup the chroot environment +# can contain %(repo)s, %(arch)s, %(project)s and %(package)s for replacement, e.g. +# /srv/oscbuild/%(repo)s-%(arch)s or +# /srv/oscbuild/%(repo)s-%(arch)s-%(project)s-%(package)s +#build-root = /var/tmp/build-root +# compile with N jobs (default: "getconf _NPROCESSORS_ONLN") +#build-jobs = N +# build-type to use - values can be (depending on the capabilities of the 'build' script) +# empty - chroot build +# kvm - kvm VM build (needs build-device, build-swap, build-memory) +# xen - xen VM build (needs build-device, build-swap, build-memory) +# experimental: +# qemu - qemu VM build +# lxc - lxc build +#build-type = +# build-device is the disk-image file to use as root for VM builds +# e.g. /var/tmp/FILE.root +#build-device = /var/tmp/FILE.root +# build-swap is the disk-image to use as swap for VM builds +# e.g. /var/tmp/FILE.swap +#build-swap = /var/tmp/FILE.swap +# build-memory is the amount of memory used in the VM +# value in MB - e.g. 512 +#build-memory = 512 +# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build +# values in MB - e.g. 4096 +#build-vmdisk-rootsize = 4096 +# build-vmdisk-swapsize is the size of the disk-image used as swap in a VM build +# values in MB - e.g. 1024 +#build-vmdisk-swapsize = 1024 +# Numeric uid:gid to assign to the "abuild" user in the build-root +# or "caller" to use the current users uid:gid +# This is convenient when sharing the buildroot with ordinary userids +# on the host. +# This should not be 0 +# build-uid = +# extra packages to install when building packages locally (osc build) +# this corresponds to osc build's -x option and can be overridden with that +# -x '' can also be given on the command line to override this setting, or +# you can have an empty setting here. +#extra-pkgs = vim gdb strace +# build platform is used if the platform argument is omitted to osc build +#build_repository = openSUSE_Factory +# default project for getpac or bco +#getpac_default_project = openSUSE:Factory +# alternate filesystem layout: have multiple subdirs, where colons were. +#checkout_no_colon = 0 +# local files to ignore with status, addremove, .... +#exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.* +# keep passwords in plaintext. If you see this comment, your osc +# already uses the encrypted password, and only keeps them in plain text +# for backwards compatibility. Default will change to 0 in future releases. +# You can remove the plaintext password without harm, if you do not need +# backwards compatibility. +#plaintext_passwd = 1 +# limit the age of requests shown with 'osc req list'. +# this is a default only, can be overridden by 'osc req list -D NNN' +# Use 0 for unlimted. +#request_list_days = 0 +# show info useful for debugging +#debug = 1 +# show HTTP traffic useful for debugging +#http_debug = 1 +# Skip signature verification of packages used for build. +#no_verify = 1 +# jump into the debugger in case of errors +#post_mortem = 1 +# print call traces in case of errors +#traceback = 1 +# use KDE/Gnome/MacOS/Windows keyring for credentials if available +#use_keyring = 1 +# check for unversioned/removed files before commit +#check_filelist = 1 +# check for pending requests after executing an action (e.g. checkout, update, commit) +#check_for_request_on_action = 0 +# what to do with the source package if the submitrequest has been accepted. If +# nothing is specified the API default is used +#submitrequest_on_accept_action = cleanup|update|noupdate +#review requests interactively (default: off) +#request_show_review = 1 +# Directory with executables to validate sources, esp before committing +#source_validator_directory = /usr/lib/osc/source_validators + +[http://localhost] +user=Admin +pass=opensuse +# set aliases for this apiurl +# aliases = foo, bar +# email used in .changes, unless the one from osc meta prj <user> will be used +# email = +# additional headers to pass to a request, e.g. for special authentication +#http_headers = Host: foofoobar, +# User: mumblegack +# Force using of keyring for this API +#keyring = 1 diff --git a/tests/update_fixtures/osctest/.osc/_apiurl b/tests/update_fixtures/osctest/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/.osc/_packages b/tests/update_fixtures/osctest/.osc/_packages new file mode 100644 index 0000000..04e56f0 --- /dev/null +++ b/tests/update_fixtures/osctest/.osc/_packages @@ -0,0 +1 @@ +<project name="osctest" /> diff --git a/tests/update_fixtures/osctest/.osc/_project b/tests/update_fixtures/osctest/.osc/_project new file mode 100644 index 0000000..b83ffd3 --- /dev/null +++ b/tests/update_fixtures/osctest/.osc/_project @@ -0,0 +1 @@ +osctest diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_apiurl b/tests/update_fixtures/osctest/already_in_conflict/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_files b/tests/update_fixtures/osctest/already_in_conflict/.osc/_files new file mode 100644 index 0000000..2ad5954 --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/_files @@ -0,0 +1,5 @@ +<directory name="already_in_conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282133912" name="foo" size="23" /> + <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282133912" name="merge" size="48" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282133912" name="nochange" size="25" /> +</directory>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_in_conflict b/tests/update_fixtures/osctest/already_in_conflict/.osc/_in_conflict new file mode 100644 index 0000000..a00af07 --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/_in_conflict @@ -0,0 +1 @@ +merge diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_meta b/tests/update_fixtures/osctest/already_in_conflict/.osc/_meta new file mode 100644 index 0000000..0150d60 --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/_meta @@ -0,0 +1,8 @@ +<package project="osctest" name="already_in_conflict"> + <title/> + <description> + + </description> + <person userid="Admin" role="maintainer"/> + <person userid="Admin" role="bugowner"/> +</package>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_osclib_version b/tests/update_fixtures/osctest/already_in_conflict/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_package b/tests/update_fixtures/osctest/already_in_conflict/.osc/_package new file mode 100644 index 0000000..c2cae8d --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/_package @@ -0,0 +1 @@ +already_in_conflict
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_project b/tests/update_fixtures/osctest/already_in_conflict/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/foo b/tests/update_fixtures/osctest/already_in_conflict/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/merge b/tests/update_fixtures/osctest/already_in_conflict/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/nochange b/tests/update_fixtures/osctest/already_in_conflict/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/already_in_conflict/foo b/tests/update_fixtures/osctest/already_in_conflict/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/already_in_conflict/merge b/tests/update_fixtures/osctest/already_in_conflict/merge new file mode 100644 index 0000000..7469d51 --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/merge @@ -0,0 +1,2 @@ +Is it +I hope so... diff --git a/tests/update_fixtures/osctest/already_in_conflict/nochange b/tests/update_fixtures/osctest/already_in_conflict/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/already_in_conflict/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/conflict/.osc/_apiurl b/tests/update_fixtures/osctest/conflict/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/conflict/.osc/_files b/tests/update_fixtures/osctest/conflict/.osc/_files new file mode 100644 index 0000000..a67ff42 --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/.osc/_files @@ -0,0 +1,5 @@ +<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" /> + <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282130148" name="merge" size="48" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282130148" name="nochange" size="25" /> +</directory>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/conflict/.osc/_osclib_version b/tests/update_fixtures/osctest/conflict/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/conflict/.osc/_package b/tests/update_fixtures/osctest/conflict/.osc/_package new file mode 100644 index 0000000..783a0ef --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/.osc/_package @@ -0,0 +1 @@ +conflict
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/conflict/.osc/_project b/tests/update_fixtures/osctest/conflict/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/conflict/.osc/foo b/tests/update_fixtures/osctest/conflict/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/conflict/.osc/merge b/tests/update_fixtures/osctest/conflict/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/conflict/.osc/nochange b/tests/update_fixtures/osctest/conflict/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/conflict/foo b/tests/update_fixtures/osctest/conflict/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/conflict/merge b/tests/update_fixtures/osctest/conflict/merge new file mode 100644 index 0000000..f4ff164 --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/merge @@ -0,0 +1,4 @@ +Is it possible +to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/conflict/nochange b/tests/update_fixtures/osctest/conflict/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/conflict/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/deleted/.osc/_apiurl b/tests/update_fixtures/osctest/deleted/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/deleted/.osc/_files b/tests/update_fixtures/osctest/deleted/.osc/_files new file mode 100644 index 0000000..d9a5451 --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/_files @@ -0,0 +1,5 @@ +<directory name="deleted" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282134731" name="foo" size="23" /> + <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282134731" name="merge" size="48" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282134731" name="nochange" size="25" /> +</directory>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/deleted/.osc/_osclib_version b/tests/update_fixtures/osctest/deleted/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/deleted/.osc/_package b/tests/update_fixtures/osctest/deleted/.osc/_package new file mode 100644 index 0000000..3c22137 --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/_package @@ -0,0 +1 @@ +deleted
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/deleted/.osc/_project b/tests/update_fixtures/osctest/deleted/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/deleted/.osc/_to_be_deleted b/tests/update_fixtures/osctest/deleted/.osc/_to_be_deleted new file mode 100644 index 0000000..fa7a1f7 --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/_to_be_deleted @@ -0,0 +1,2 @@ +merge +foo diff --git a/tests/update_fixtures/osctest/deleted/.osc/foo b/tests/update_fixtures/osctest/deleted/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/deleted/.osc/merge b/tests/update_fixtures/osctest/deleted/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/deleted/.osc/nochange b/tests/update_fixtures/osctest/deleted/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/deleted/merge b/tests/update_fixtures/osctest/deleted/merge new file mode 100644 index 0000000..c229519 --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/merge @@ -0,0 +1,3 @@ +Is it possible to, +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/deleted/nochange b/tests/update_fixtures/osctest/deleted/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/deleted/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_apiurl b/tests/update_fixtures/osctest/limitsize/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_files b/tests/update_fixtures/osctest/limitsize/.osc/_files new file mode 100644 index 0000000..77d67af --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/.osc/_files @@ -0,0 +1,5 @@ +<directory name="limitsize" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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> diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_osclib_version b/tests/update_fixtures/osctest/limitsize/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_package b/tests/update_fixtures/osctest/limitsize/.osc/_package new file mode 100644 index 0000000..edc7cc1 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/.osc/_package @@ -0,0 +1 @@ +limitsize diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_project b/tests/update_fixtures/osctest/limitsize/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/limitsize/.osc/foo b/tests/update_fixtures/osctest/limitsize/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/limitsize/.osc/merge b/tests/update_fixtures/osctest/limitsize/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/limitsize/.osc/nochange b/tests/update_fixtures/osctest/limitsize/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/limitsize/foo b/tests/update_fixtures/osctest/limitsize/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/limitsize/merge b/tests/update_fixtures/osctest/limitsize/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/limitsize/nochange b/tests/update_fixtures/osctest/limitsize/nochange new file mode 100644 index 0000000..3a48a29 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize/nochange @@ -0,0 +1,2 @@ +This file didn't change but +is modified. diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_apiurl b/tests/update_fixtures/osctest/limitsize_local/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_files b/tests/update_fixtures/osctest/limitsize_local/.osc/_files new file mode 100644 index 0000000..77d67af --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/_files @@ -0,0 +1,5 @@ +<directory name="limitsize" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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> diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_osclib_version b/tests/update_fixtures/osctest/limitsize_local/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_package b/tests/update_fixtures/osctest/limitsize_local/.osc/_package new file mode 100644 index 0000000..64a5ed3 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/_package @@ -0,0 +1 @@ +limitsize_local diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_project b/tests/update_fixtures/osctest/limitsize_local/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_size_limit b/tests/update_fixtures/osctest/limitsize_local/.osc/_size_limit new file mode 100644 index 0000000..64bb6b7 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/_size_limit @@ -0,0 +1 @@ +30 diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/foo b/tests/update_fixtures/osctest/limitsize_local/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/merge b/tests/update_fixtures/osctest/limitsize_local/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/nochange b/tests/update_fixtures/osctest/limitsize_local/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/limitsize_local/foo b/tests/update_fixtures/osctest/limitsize_local/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/limitsize_local/merge b/tests/update_fixtures/osctest/limitsize_local/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/limitsize_local/nochange b/tests/update_fixtures/osctest/limitsize_local/nochange new file mode 100644 index 0000000..3a48a29 --- /dev/null +++ b/tests/update_fixtures/osctest/limitsize_local/nochange @@ -0,0 +1,2 @@ +This file didn't change but +is modified. diff --git a/tests/update_fixtures/osctest/metamode/.osc/_apiurl b/tests/update_fixtures/osctest/metamode/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/metamode/.osc/_files b/tests/update_fixtures/osctest/metamode/.osc/_files new file mode 100644 index 0000000..f0dac1f --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/_files @@ -0,0 +1,5 @@ +<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/metamode/.osc/_meta_mode b/tests/update_fixtures/osctest/metamode/.osc/_meta_mode new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/_meta_mode diff --git a/tests/update_fixtures/osctest/metamode/.osc/_osclib_version b/tests/update_fixtures/osctest/metamode/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/metamode/.osc/_package b/tests/update_fixtures/osctest/metamode/.osc/_package new file mode 100644 index 0000000..862084f --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/_package @@ -0,0 +1 @@ +metamode diff --git a/tests/update_fixtures/osctest/metamode/.osc/_project b/tests/update_fixtures/osctest/metamode/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/metamode/.osc/foo b/tests/update_fixtures/osctest/metamode/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/metamode/.osc/merge b/tests/update_fixtures/osctest/metamode/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/metamode/.osc/nochange b/tests/update_fixtures/osctest/metamode/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/metamode/foo b/tests/update_fixtures/osctest/metamode/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/metamode/merge b/tests/update_fixtures/osctest/metamode/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/metamode/nochange b/tests/update_fixtures/osctest/metamode/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/metamode/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/new/.osc/_apiurl b/tests/update_fixtures/osctest/new/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/new/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/new/.osc/_files b/tests/update_fixtures/osctest/new/.osc/_files new file mode 100644 index 0000000..d915967 --- /dev/null +++ b/tests/update_fixtures/osctest/new/.osc/_files @@ -0,0 +1 @@ +<directory name="new" /> diff --git a/tests/update_fixtures/osctest/new/.osc/_osclib_version b/tests/update_fixtures/osctest/new/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/new/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/new/.osc/_package b/tests/update_fixtures/osctest/new/.osc/_package new file mode 100644 index 0000000..3e75765 --- /dev/null +++ b/tests/update_fixtures/osctest/new/.osc/_package @@ -0,0 +1 @@ +new diff --git a/tests/update_fixtures/osctest/new/.osc/_project b/tests/update_fixtures/osctest/new/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/new/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/restore/.osc/_apiurl b/tests/update_fixtures/osctest/restore/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/restore/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/restore/.osc/_files b/tests/update_fixtures/osctest/restore/.osc/_files new file mode 100644 index 0000000..a6b0cc6 --- /dev/null +++ b/tests/update_fixtures/osctest/restore/.osc/_files @@ -0,0 +1,5 @@ +<directory name="restore" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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> diff --git a/tests/update_fixtures/osctest/restore/.osc/_osclib_version b/tests/update_fixtures/osctest/restore/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/restore/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/restore/.osc/_package b/tests/update_fixtures/osctest/restore/.osc/_package new file mode 100644 index 0000000..a9db91d --- /dev/null +++ b/tests/update_fixtures/osctest/restore/.osc/_package @@ -0,0 +1 @@ +restore diff --git a/tests/update_fixtures/osctest/restore/.osc/_project b/tests/update_fixtures/osctest/restore/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/restore/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/restore/.osc/foo b/tests/update_fixtures/osctest/restore/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/restore/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/restore/.osc/merge b/tests/update_fixtures/osctest/restore/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/restore/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/restore/.osc/nochange b/tests/update_fixtures/osctest/restore/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/restore/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/restore/exists b/tests/update_fixtures/osctest/restore/exists new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/update_fixtures/osctest/restore/exists diff --git a/tests/update_fixtures/osctest/restore/merge b/tests/update_fixtures/osctest/restore/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/restore/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/restore/nochange b/tests/update_fixtures/osctest/restore/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/restore/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/resume/.osc/_apiurl b/tests/update_fixtures/osctest/resume/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/resume/.osc/_files b/tests/update_fixtures/osctest/resume/.osc/_files new file mode 100644 index 0000000..e4f249e --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/_files @@ -0,0 +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> diff --git a/tests/update_fixtures/osctest/resume/.osc/_in_update/_files b/tests/update_fixtures/osctest/resume/.osc/_in_update/_files new file mode 100644 index 0000000..0b0a0c8 --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/_in_update/_files @@ -0,0 +1,6 @@ +<directory name="simple" rev="2" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="2"> + <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> diff --git a/tests/update_fixtures/osctest/resume/.osc/_in_update/foo b/tests/update_fixtures/osctest/resume/.osc/_in_update/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/_in_update/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/resume/.osc/_meta b/tests/update_fixtures/osctest/resume/.osc/_meta new file mode 100644 index 0000000..abd3720 --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/_meta @@ -0,0 +1,8 @@ +<package project="osctest" name="simple"> + <title/> + <description> + + </description> + <person userid="Admin" role="maintainer"/> + <person userid="Admin" role="bugowner"/> +</package>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/resume/.osc/_osclib_version b/tests/update_fixtures/osctest/resume/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/resume/.osc/_package b/tests/update_fixtures/osctest/resume/.osc/_package new file mode 100644 index 0000000..8fd3246 --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/_package @@ -0,0 +1 @@ +simple
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/resume/.osc/_project b/tests/update_fixtures/osctest/resume/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/resume/.osc/added b/tests/update_fixtures/osctest/resume/.osc/added new file mode 100644 index 0000000..0527e6b --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/added @@ -0,0 +1 @@ +This is a test diff --git a/tests/update_fixtures/osctest/resume/.osc/foo b/tests/update_fixtures/osctest/resume/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/resume/.osc/merge b/tests/update_fixtures/osctest/resume/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/resume/.osc/nochange b/tests/update_fixtures/osctest/resume/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/resume/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/resume/added b/tests/update_fixtures/osctest/resume/added new file mode 100644 index 0000000..0527e6b --- /dev/null +++ b/tests/update_fixtures/osctest/resume/added @@ -0,0 +1 @@ +This is a test diff --git a/tests/update_fixtures/osctest/resume/exists b/tests/update_fixtures/osctest/resume/exists new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/update_fixtures/osctest/resume/exists diff --git a/tests/update_fixtures/osctest/resume/foo b/tests/update_fixtures/osctest/resume/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/resume/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/resume/merge b/tests/update_fixtures/osctest/resume/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/resume/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/resume/nochange b/tests/update_fixtures/osctest/resume/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/resume/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_apiurl b/tests/update_fixtures/osctest/resume_deleted/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_files b/tests/update_fixtures/osctest/resume_deleted/.osc/_files new file mode 100644 index 0000000..5796136 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_files @@ -0,0 +1,6 @@ +<directory name="simple" rev="1" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="1"> + <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" /> +</directory> diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_in_update/_files b/tests/update_fixtures/osctest/resume_deleted/.osc/_in_update/_files new file mode 100644 index 0000000..f0dac1f --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_in_update/_files @@ -0,0 +1,5 @@ +<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_in_update/foo b/tests/update_fixtures/osctest/resume_deleted/.osc/_in_update/foo new file mode 100644 index 0000000..323fae0 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_in_update/foo @@ -0,0 +1 @@ +foobar diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_meta b/tests/update_fixtures/osctest/resume_deleted/.osc/_meta new file mode 100644 index 0000000..abd3720 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_meta @@ -0,0 +1,8 @@ +<package project="osctest" name="simple"> + <title/> + <description> + + </description> + <person userid="Admin" role="maintainer"/> + <person userid="Admin" role="bugowner"/> +</package>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_osclib_version b/tests/update_fixtures/osctest/resume_deleted/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_package b/tests/update_fixtures/osctest/resume_deleted/.osc/_package new file mode 100644 index 0000000..8fd3246 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_package @@ -0,0 +1 @@ +simple
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_project b/tests/update_fixtures/osctest/resume_deleted/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/added b/tests/update_fixtures/osctest/resume_deleted/.osc/added new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/added diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/foo b/tests/update_fixtures/osctest/resume_deleted/.osc/foo new file mode 100644 index 0000000..323fae0 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/foo @@ -0,0 +1 @@ +foobar diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/merge b/tests/update_fixtures/osctest/resume_deleted/.osc/merge new file mode 100644 index 0000000..2563d89 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/merge @@ -0,0 +1,5 @@ +xxx +xxx +yyy +zzz +zzz diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/nochange b/tests/update_fixtures/osctest/resume_deleted/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/resume_deleted/added b/tests/update_fixtures/osctest/resume_deleted/added new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/added diff --git a/tests/update_fixtures/osctest/resume_deleted/exists b/tests/update_fixtures/osctest/resume_deleted/exists new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/exists diff --git a/tests/update_fixtures/osctest/resume_deleted/f b/tests/update_fixtures/osctest/resume_deleted/f new file mode 100644 index 0000000..0527e6b --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/f @@ -0,0 +1 @@ +This is a test diff --git a/tests/update_fixtures/osctest/resume_deleted/foo b/tests/update_fixtures/osctest/resume_deleted/foo new file mode 100644 index 0000000..323fae0 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/foo @@ -0,0 +1 @@ +foobar diff --git a/tests/update_fixtures/osctest/resume_deleted/merge b/tests/update_fixtures/osctest/resume_deleted/merge new file mode 100644 index 0000000..2563d89 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/merge @@ -0,0 +1,5 @@ +xxx +xxx +yyy +zzz +zzz diff --git a/tests/update_fixtures/osctest/resume_deleted/nochange b/tests/update_fixtures/osctest/resume_deleted/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/resume_deleted/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/services/.osc/_apiurl b/tests/update_fixtures/osctest/services/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/services/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/services/.osc/_files b/tests/update_fixtures/osctest/services/.osc/_files new file mode 100644 index 0000000..9209ca9 --- /dev/null +++ b/tests/update_fixtures/osctest/services/.osc/_files @@ -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> diff --git a/tests/update_fixtures/osctest/services/.osc/_osclib_version b/tests/update_fixtures/osctest/services/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/services/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/services/.osc/_package b/tests/update_fixtures/osctest/services/.osc/_package new file mode 100644 index 0000000..f7a48f2 --- /dev/null +++ b/tests/update_fixtures/osctest/services/.osc/_package @@ -0,0 +1 @@ +services diff --git a/tests/update_fixtures/osctest/services/.osc/_project b/tests/update_fixtures/osctest/services/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/services/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/services/.osc/foo b/tests/update_fixtures/osctest/services/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/services/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/services/.osc/merge b/tests/update_fixtures/osctest/services/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/services/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/services/_service:exists b/tests/update_fixtures/osctest/services/_service:exists new file mode 100644 index 0000000..85e1c2f --- /dev/null +++ b/tests/update_fixtures/osctest/services/_service:exists @@ -0,0 +1,2 @@ +another service +foo diff --git a/tests/update_fixtures/osctest/services/foo b/tests/update_fixtures/osctest/services/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/services/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/services/merge b/tests/update_fixtures/osctest/services/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/services/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/simple/.osc/_apiurl b/tests/update_fixtures/osctest/simple/.osc/_apiurl new file mode 100644 index 0000000..0afeace --- /dev/null +++ b/tests/update_fixtures/osctest/simple/.osc/_apiurl @@ -0,0 +1 @@ +http://localhost diff --git a/tests/update_fixtures/osctest/simple/.osc/_files b/tests/update_fixtures/osctest/simple/.osc/_files new file mode 100644 index 0000000..f0dac1f --- /dev/null +++ b/tests/update_fixtures/osctest/simple/.osc/_files @@ -0,0 +1,5 @@ +<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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>
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/simple/.osc/_osclib_version b/tests/update_fixtures/osctest/simple/.osc/_osclib_version new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/tests/update_fixtures/osctest/simple/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/tests/update_fixtures/osctest/simple/.osc/_package b/tests/update_fixtures/osctest/simple/.osc/_package new file mode 100644 index 0000000..8fd3246 --- /dev/null +++ b/tests/update_fixtures/osctest/simple/.osc/_package @@ -0,0 +1 @@ +simple
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/simple/.osc/_project b/tests/update_fixtures/osctest/simple/.osc/_project new file mode 100644 index 0000000..cea3bc8 --- /dev/null +++ b/tests/update_fixtures/osctest/simple/.osc/_project @@ -0,0 +1 @@ +osctest
\ No newline at end of file diff --git a/tests/update_fixtures/osctest/simple/.osc/foo b/tests/update_fixtures/osctest/simple/.osc/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/simple/.osc/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/simple/.osc/merge b/tests/update_fixtures/osctest/simple/.osc/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/simple/.osc/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/simple/.osc/nochange b/tests/update_fixtures/osctest/simple/.osc/nochange new file mode 100644 index 0000000..0569b03 --- /dev/null +++ b/tests/update_fixtures/osctest/simple/.osc/nochange @@ -0,0 +1 @@ +This file didn't change. diff --git a/tests/update_fixtures/osctest/simple/exists b/tests/update_fixtures/osctest/simple/exists new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/update_fixtures/osctest/simple/exists diff --git a/tests/update_fixtures/osctest/simple/foo b/tests/update_fixtures/osctest/simple/foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/osctest/simple/foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/osctest/simple/merge b/tests/update_fixtures/osctest/simple/merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/osctest/simple/merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/osctest/simple/nochange b/tests/update_fixtures/osctest/simple/nochange new file mode 100644 index 0000000..3a48a29 --- /dev/null +++ b/tests/update_fixtures/osctest/simple/nochange @@ -0,0 +1,2 @@ +This file didn't change but +is modified. diff --git a/tests/update_fixtures/testUpdateAlreadyInConflict_files b/tests/update_fixtures/testUpdateAlreadyInConflict_files new file mode 100644 index 0000000..96b9752 --- /dev/null +++ b/tests/update_fixtures/testUpdateAlreadyInConflict_files @@ -0,0 +1,5 @@ +<directory name="already_in_conflict" rev="2" srcmd5="686b725018c89978678e15daa666ff85" vrev="2"> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282133912" name="foo" size="23" /> + <entry md5="14758f1afd44c09b7992073ccf00b43d" mtime="1282134056" name="merge" size="7" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282133912" name="nochange" size="25" /> +</directory> diff --git a/tests/update_fixtures/testUpdateAlreadyInConflict_merge b/tests/update_fixtures/testUpdateAlreadyInConflict_merge new file mode 100644 index 0000000..323fae0 --- /dev/null +++ b/tests/update_fixtures/testUpdateAlreadyInConflict_merge @@ -0,0 +1 @@ +foobar diff --git a/tests/update_fixtures/testUpdateConflict_files b/tests/update_fixtures/testUpdateConflict_files new file mode 100644 index 0000000..93cd6a2 --- /dev/null +++ b/tests/update_fixtures/testUpdateConflict_files @@ -0,0 +1,5 @@ +<directory name="conflict" rev="2" srcmd5="6463d0bd161765e9a2b7186606c72ca1" vrev="2"> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" /> + <entry md5="89fcd308c6e6919c472e56ec82ace945" mtime="1282130545" name="merge" size="46" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282130148" name="nochange" size="25" /> +</directory> diff --git a/tests/update_fixtures/testUpdateConflict_merge b/tests/update_fixtures/testUpdateConflict_merge new file mode 100644 index 0000000..f9f1e5a --- /dev/null +++ b/tests/update_fixtures/testUpdateConflict_merge @@ -0,0 +1,4 @@ +Is +it possible to +merge this file? +We'll see. diff --git a/tests/update_fixtures/testUpdateDeletedFile_files b/tests/update_fixtures/testUpdateDeletedFile_files new file mode 100644 index 0000000..9a8cc25 --- /dev/null +++ b/tests/update_fixtures/testUpdateDeletedFile_files @@ -0,0 +1,4 @@ +<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> + <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> +</directory> diff --git a/tests/update_fixtures/testUpdateLimitSizeAddDelete_exists b/tests/update_fixtures/testUpdateLimitSizeAddDelete_exists new file mode 100644 index 0000000..ac79041 --- /dev/null +++ b/tests/update_fixtures/testUpdateLimitSizeAddDelete_exists @@ -0,0 +1 @@ +small diff --git a/tests/update_fixtures/testUpdateLimitSizeAddDelete_files b/tests/update_fixtures/testUpdateLimitSizeAddDelete_files new file mode 100644 index 0000000..a06a209 --- /dev/null +++ b/tests/update_fixtures/testUpdateLimitSizeAddDelete_files @@ -0,0 +1,6 @@ +<directory name="foo" rev="2" srcmd5="018a80019e08143e7ae324c778873d62" vrev="2"> + <entry md5="ed955c917012307d982b7cdd5799ff1a" mtime="1282320398" name="bigfile" size="69" skipped="true" /> + <entry md5="d15dbfcb847653913855e21370d83af1" mtime="1282553634" name="exists" size="6" /> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" skipped="true" /> + <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" skipped="true" /> +</directory> diff --git a/tests/update_fixtures/testUpdateLimitSizeAddDelete_filesremote b/tests/update_fixtures/testUpdateLimitSizeAddDelete_filesremote new file mode 100644 index 0000000..329f100 --- /dev/null +++ b/tests/update_fixtures/testUpdateLimitSizeAddDelete_filesremote @@ -0,0 +1,6 @@ +<directory name="foo" rev="2" vrev="2" srcmd5="018a80019e08143e7ae324c778873d62"> + <entry name="bigfile" md5="ed955c917012307d982b7cdd5799ff1a" size="69" mtime="1282320398" /> + <entry name="exists" md5="d15dbfcb847653913855e21370d83af1" size="6" mtime="1282553634" /> + <entry name="foo" md5="0d62ceea6020d75154078a20d8c9f9ba" size="23" mtime="1282320303" /> + <entry name="merge" md5="17b9e9e1a032ed44e7a584dc6303ffa8" size="48" mtime="1282320303" /> +</directory> diff --git a/tests/update_fixtures/testUpdateLimitSizeNoChange_files b/tests/update_fixtures/testUpdateLimitSizeNoChange_files new file mode 100644 index 0000000..1745544 --- /dev/null +++ b/tests/update_fixtures/testUpdateLimitSizeNoChange_files @@ -0,0 +1,6 @@ +<directory name="limitsize" rev="2" srcmd5="e51a3133d3d3eb2a48e06efb79e2d503" vrev="2"> + <entry md5="ed955c917012307d982b7cdd5799ff1a" mtime="1282320398" name="bigfile" size="69" skipped="true" /> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" /> + <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> +</directory> diff --git a/tests/update_fixtures/testUpdateLimitSizeNoChange_filesremote b/tests/update_fixtures/testUpdateLimitSizeNoChange_filesremote new file mode 100644 index 0000000..6a3ced8 --- /dev/null +++ b/tests/update_fixtures/testUpdateLimitSizeNoChange_filesremote @@ -0,0 +1,6 @@ +<directory name="limitsize" rev="2" vrev="2" srcmd5="e51a3133d3d3eb2a48e06efb79e2d503"> + <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" /> + <entry name="nochange" md5="7efa70f68983fad1cf487f69dedf93e9" size="25" mtime="1282047303" /> +</directory> diff --git a/tests/update_fixtures/testUpdateLocalDeletions_files b/tests/update_fixtures/testUpdateLocalDeletions_files new file mode 100644 index 0000000..d1b7f80 --- /dev/null +++ b/tests/update_fixtures/testUpdateLocalDeletions_files @@ -0,0 +1,5 @@ +<directory name="deleted" rev="2" srcmd5="0e717058d371ab9029336418c8c883bd" vrev="2"> + <entry md5="2bb5f888a0063a0931c12f35851953e4" mtime="1282135005" name="foo" size="37" /> + <entry md5="426e11f11438365322f102c02b0a33f0" mtime="1282134896" name="merge" size="50" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282134731" name="nochange" size="25" /> +</directory> diff --git a/tests/update_fixtures/testUpdateLocalDeletions_foo b/tests/update_fixtures/testUpdateLocalDeletions_foo new file mode 100644 index 0000000..0319af9 --- /dev/null +++ b/tests/update_fixtures/testUpdateLocalDeletions_foo @@ -0,0 +1,2 @@ +This is a simple test. +And an update diff --git a/tests/update_fixtures/testUpdateLocalDeletions_merge b/tests/update_fixtures/testUpdateLocalDeletions_merge new file mode 100644 index 0000000..df2934d --- /dev/null +++ b/tests/update_fixtures/testUpdateLocalDeletions_merge @@ -0,0 +1,4 @@ +Is +it possible to +merge this file? +We'll see. Foo diff --git a/tests/update_fixtures/testUpdateLocalLimitSizeNoChange_files b/tests/update_fixtures/testUpdateLocalLimitSizeNoChange_files new file mode 100644 index 0000000..f03a9b5 --- /dev/null +++ b/tests/update_fixtures/testUpdateLocalLimitSizeNoChange_files @@ -0,0 +1,6 @@ +<directory name="limitsize_local" rev="2" srcmd5="e51a3133d3d3eb2a48e06efb79e2d503" vrev="2"> + <entry md5="ed955c917012307d982b7cdd5799ff1a" mtime="1282320398" name="bigfile" size="69" skipped="true" /> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282320303" name="foo" size="23" /> + <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282320303" name="merge" size="48" skipped="true" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> +</directory> diff --git a/tests/update_fixtures/testUpdateLocalLimitSizeNoChange_filesremote b/tests/update_fixtures/testUpdateLocalLimitSizeNoChange_filesremote new file mode 100644 index 0000000..4ffd780 --- /dev/null +++ b/tests/update_fixtures/testUpdateLocalLimitSizeNoChange_filesremote @@ -0,0 +1,6 @@ +<directory name="limitsize_local" rev="2" vrev="2" srcmd5="e51a3133d3d3eb2a48e06efb79e2d503"> + <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" /> + <entry name="nochange" md5="7efa70f68983fad1cf487f69dedf93e9" size="25" mtime="1282047303" /> +</directory> diff --git a/tests/update_fixtures/testUpdateMetaMode__meta b/tests/update_fixtures/testUpdateMetaMode__meta new file mode 100644 index 0000000..2c2c701 --- /dev/null +++ b/tests/update_fixtures/testUpdateMetaMode__meta @@ -0,0 +1,4 @@ +<package project="osctest" name="metamode"> + <title>foo</title> + <description /> +</package> diff --git a/tests/update_fixtures/testUpdateMetaMode_filesremote b/tests/update_fixtures/testUpdateMetaMode_filesremote new file mode 100644 index 0000000..faca442 --- /dev/null +++ b/tests/update_fixtures/testUpdateMetaMode_filesremote @@ -0,0 +1,3 @@ +<directory name="metamode" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <entry md5="b995ef5586bdb37154bdeac0bda18c51" mtime="1283265642" name="_meta" size="95" /> +</directory> diff --git a/tests/update_fixtures/testUpdateNewFileLocalExists_exists b/tests/update_fixtures/testUpdateNewFileLocalExists_exists new file mode 100644 index 0000000..9ca11f8 --- /dev/null +++ b/tests/update_fixtures/testUpdateNewFileLocalExists_exists @@ -0,0 +1 @@ +exists diff --git a/tests/update_fixtures/testUpdateNewFileLocalExists_files b/tests/update_fixtures/testUpdateNewFileLocalExists_files new file mode 100644 index 0000000..543b47e --- /dev/null +++ b/tests/update_fixtures/testUpdateNewFileLocalExists_files @@ -0,0 +1,6 @@ +<directory name="simple" rev="2" srcmd5="28fe7af7e9985507cf51196fc67015b7" vrev="2"> + <entry md5="7ba6ca74b292aaa5d46bc407ac5be166" mtime="1282060455" name="exists" size="7" /> + <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> diff --git a/tests/update_fixtures/testUpdateNewFile_files b/tests/update_fixtures/testUpdateNewFile_files new file mode 100644 index 0000000..f852ed2 --- /dev/null +++ b/tests/update_fixtures/testUpdateNewFile_files @@ -0,0 +1,6 @@ +<directory name="simple" rev="2" srcmd5="9247f30cd5694f5301965a0f20a2ed16" vrev="2"> + <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" /> + <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282054323" name="upstream_added" size="23" /> +</directory> diff --git a/tests/update_fixtures/testUpdateNewFile_upstream_added b/tests/update_fixtures/testUpdateNewFile_upstream_added new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/testUpdateNewFile_upstream_added @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/testUpdateNew_filesremote b/tests/update_fixtures/testUpdateNew_filesremote new file mode 100644 index 0000000..432daa9 --- /dev/null +++ b/tests/update_fixtures/testUpdateNew_filesremote @@ -0,0 +1,2 @@ +<directory name="new"> +</directory> diff --git a/tests/update_fixtures/testUpdateNoChanges_files b/tests/update_fixtures/testUpdateNoChanges_files new file mode 100644 index 0000000..d2e3da5 --- /dev/null +++ b/tests/update_fixtures/testUpdateNoChanges_files @@ -0,0 +1,5 @@ +<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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> diff --git a/tests/update_fixtures/testUpdateRestore_files b/tests/update_fixtures/testUpdateRestore_files new file mode 100644 index 0000000..d2e3da5 --- /dev/null +++ b/tests/update_fixtures/testUpdateRestore_files @@ -0,0 +1,5 @@ +<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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> diff --git a/tests/update_fixtures/testUpdateRestore_foo b/tests/update_fixtures/testUpdateRestore_foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/testUpdateRestore_foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/testUpdateResumeDeletedFile_files b/tests/update_fixtures/testUpdateResumeDeletedFile_files new file mode 100644 index 0000000..d2e3da5 --- /dev/null +++ b/tests/update_fixtures/testUpdateResumeDeletedFile_files @@ -0,0 +1,5 @@ +<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> + <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> diff --git a/tests/update_fixtures/testUpdateResumeDeletedFile_foo b/tests/update_fixtures/testUpdateResumeDeletedFile_foo new file mode 100644 index 0000000..3bb34cf --- /dev/null +++ b/tests/update_fixtures/testUpdateResumeDeletedFile_foo @@ -0,0 +1 @@ +This is a simple test. diff --git a/tests/update_fixtures/testUpdateResumeDeletedFile_merge b/tests/update_fixtures/testUpdateResumeDeletedFile_merge new file mode 100644 index 0000000..0b4685d --- /dev/null +++ b/tests/update_fixtures/testUpdateResumeDeletedFile_merge @@ -0,0 +1,4 @@ +Is it +possible to +merge this file? +I hope so... diff --git a/tests/update_fixtures/testUpdateResume_files b/tests/update_fixtures/testUpdateResume_files new file mode 100644 index 0000000..0b0a0c8 --- /dev/null +++ b/tests/update_fixtures/testUpdateResume_files @@ -0,0 +1,6 @@ +<directory name="simple" rev="2" srcmd5="3ac41c59a5ed169d5ffef4d824700f7d" vrev="2"> + <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> diff --git a/tests/update_fixtures/testUpdateResume_foo b/tests/update_fixtures/testUpdateResume_foo new file mode 100644 index 0000000..323fae0 --- /dev/null +++ b/tests/update_fixtures/testUpdateResume_foo @@ -0,0 +1 @@ +foobar diff --git a/tests/update_fixtures/testUpdateResume_merge b/tests/update_fixtures/testUpdateResume_merge new file mode 100644 index 0000000..2563d89 --- /dev/null +++ b/tests/update_fixtures/testUpdateResume_merge @@ -0,0 +1,5 @@ +xxx +xxx +yyy +zzz +zzz diff --git a/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:bar b/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:bar new file mode 100644 index 0000000..5fe9f1f --- /dev/null +++ b/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:bar @@ -0,0 +1 @@ +another service diff --git a/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:foo b/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:foo new file mode 100644 index 0000000..ac79041 --- /dev/null +++ b/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:foo @@ -0,0 +1 @@ +small diff --git a/tests/update_fixtures/testUpdateServiceFilesAddDelete_bigfile b/tests/update_fixtures/testUpdateServiceFilesAddDelete_bigfile new file mode 100644 index 0000000..8b7b0f9 --- /dev/null +++ b/tests/update_fixtures/testUpdateServiceFilesAddDelete_bigfile @@ -0,0 +1,5 @@ +This is a file +with a lot of +text. Foo foo +bar bar bar. +foobarfoobar diff --git a/tests/update_fixtures/testUpdateServiceFilesAddDelete_files b/tests/update_fixtures/testUpdateServiceFilesAddDelete_files new file mode 100644 index 0000000..35e0945 --- /dev/null +++ b/tests/update_fixtures/testUpdateServiceFilesAddDelete_files @@ -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> diff --git a/tests/update_fixtures/testUpdateServiceFilesAddDelete_filesremote b/tests/update_fixtures/testUpdateServiceFilesAddDelete_filesremote new file mode 100644 index 0000000..8f4e3ae --- /dev/null +++ b/tests/update_fixtures/testUpdateServiceFilesAddDelete_filesremote @@ -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> diff --git a/tests/update_fixtures/testUpdateUpstreamModifiedFile_files b/tests/update_fixtures/testUpdateUpstreamModifiedFile_files new file mode 100644 index 0000000..c605722 --- /dev/null +++ b/tests/update_fixtures/testUpdateUpstreamModifiedFile_files @@ -0,0 +1,5 @@ +<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> + <entry md5="bb3a1efda68dff80ec3a2fb599b97ad8" mtime="1282058167" name="foo" size="39" /> + <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> + <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> +</directory> diff --git a/tests/update_fixtures/testUpdateUpstreamModifiedFile_foo b/tests/update_fixtures/testUpdateUpstreamModifiedFile_foo new file mode 100644 index 0000000..4083ca8 --- /dev/null +++ b/tests/update_fixtures/testUpdateUpstreamModifiedFile_foo @@ -0,0 +1,3 @@ +<added> +This is a simple test. +<added> |