diff options
| author | Zhang Qiang <qiang.z.zhang@intel.com> | 2014-05-08 15:24:58 +0800 |
|---|---|---|
| committer | Zhang Qiang <qiang.z.zhang@intel.com> | 2014-07-03 09:29:16 +0800 |
| commit | af673cc12a0d6d145f4662bfa98e86288b04ca24 (patch) | |
| tree | dc19becaad9716aed8a91999749af015c33bd84f | |
| parent | 01830214ab8ab8bf2b4f3e34a63874857e4953ca (diff) | |
| download | osc-upstream/0.139.0.tar.gz osc-upstream/0.139.0.tar.bz2 osc-upstream/0.139.0.zip | |
clean up unit testupstream/0.139.0upstream
Change-Id: I3aaf9e4d01071d229f6f630e453042ef2618fe4c
895 files changed, 0 insertions, 6330 deletions
diff --git a/tests/addfile_fixtures/oscrc b/tests/addfile_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/addfile_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/addfile_fixtures/osctest/.osc/_apiurl b/tests/addfile_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/addfile_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/addfile_fixtures/osctest/.osc/_packages b/tests/addfile_fixtures/osctest/.osc/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/addfile_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/addfile_fixtures/osctest/.osc/_project b/tests/addfile_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/addfile_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/addfile_fixtures/osctest/simple/.osc/_apiurl b/tests/addfile_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/addfile_fixtures/osctest/simple/.osc/_files b/tests/addfile_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/addfile_fixtures/osctest/simple/.osc/_osclib_version b/tests/addfile_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/addfile_fixtures/osctest/simple/.osc/_package b/tests/addfile_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/addfile_fixtures/osctest/simple/.osc/_project b/tests/addfile_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/addfile_fixtures/osctest/simple/.osc/_to_be_deleted b/tests/addfile_fixtures/osctest/simple/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/addfile_fixtures/osctest/simple/.osc/foo b/tests/addfile_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/addfile_fixtures/osctest/simple/.osc/merge b/tests/addfile_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/addfile_fixtures/osctest/simple/.osc/nochange b/tests/addfile_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/addfile_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/addfile_fixtures/osctest/simple/merge b/tests/addfile_fixtures/osctest/simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/addfile_fixtures/osctest/simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/addfile_fixtures/osctest/simple/nochange b/tests/addfile_fixtures/osctest/simple/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/addfile_fixtures/osctest/simple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/addfile_fixtures/osctest/simple/toadd1 b/tests/addfile_fixtures/osctest/simple/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/addfile_fixtures/osctest/simple/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/addfile_fixtures/osctest/simple/toadd2 b/tests/addfile_fixtures/osctest/simple/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/addfile_fixtures/osctest/simple/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/commit_fixtures/oscrc b/tests/commit_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/commit_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/commit_fixtures/osctest/.osc/_apiurl b/tests/commit_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/.osc/_packages b/tests/commit_fixtures/osctest/.osc/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/commit_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/commit_fixtures/osctest/.osc/_project b/tests/commit_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/commit_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/commit_fixtures/osctest/add/.osc/_apiurl b/tests/commit_fixtures/osctest/add/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/add/.osc/_files b/tests/commit_fixtures/osctest/add/.osc/_files deleted file mode 100644 index 6c3d53a..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="add" 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/commit_fixtures/osctest/add/.osc/_osclib_version b/tests/commit_fixtures/osctest/add/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/add/.osc/_package b/tests/commit_fixtures/osctest/add/.osc/_package deleted file mode 100644 index 76d4bb8..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -add diff --git a/tests/commit_fixtures/osctest/add/.osc/_project b/tests/commit_fixtures/osctest/add/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/add/.osc/_to_be_added b/tests/commit_fixtures/osctest/add/.osc/_to_be_added deleted file mode 100644 index 76d4bb8..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -add diff --git a/tests/commit_fixtures/osctest/add/.osc/foo b/tests/commit_fixtures/osctest/add/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/add/.osc/merge b/tests/commit_fixtures/osctest/add/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/add/.osc/nochange b/tests/commit_fixtures/osctest/add/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/add/add b/tests/commit_fixtures/osctest/add/add deleted file mode 100644 index b242c36..0000000 --- a/tests/commit_fixtures/osctest/add/add +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tests/commit_fixtures/osctest/add/exists b/tests/commit_fixtures/osctest/add/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/add/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/add/foo b/tests/commit_fixtures/osctest/add/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/add/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/add/merge b/tests/commit_fixtures/osctest/add/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/add/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/add/nochange b/tests/commit_fixtures/osctest/add/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/add/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_apiurl b/tests/commit_fixtures/osctest/added_missing/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_files b/tests/commit_fixtures/osctest/added_missing/.osc/_files deleted file mode 100644 index d474ef3..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_files +++ /dev/null @@ -1,3 +0,0 @@ -<directory name="added_missing" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" skipped="True" /> -</directory> diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_osclib_version b/tests/commit_fixtures/osctest/added_missing/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_package b/tests/commit_fixtures/osctest/added_missing/.osc/_package deleted file mode 100644 index db0af96..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -added_missing diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_project b/tests/commit_fixtures/osctest/added_missing/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_to_be_added b/tests/commit_fixtures/osctest/added_missing/.osc/_to_be_added deleted file mode 100644 index b03d55d..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_to_be_added +++ /dev/null @@ -1,2 +0,0 @@ -add -bar diff --git a/tests/commit_fixtures/osctest/added_missing/bar b/tests/commit_fixtures/osctest/added_missing/bar deleted file mode 100644 index 323fae0..0000000 --- a/tests/commit_fixtures/osctest/added_missing/bar +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_apiurl b/tests/commit_fixtures/osctest/allstates/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_files b/tests/commit_fixtures/osctest/allstates/.osc/_files deleted file mode 100644 index 02a576b..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_files +++ /dev/null @@ -1,8 +0,0 @@ -<directory name="allstates" 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="676513fde5797c3785164942c97dfec1" mtime="1283506309" name="missing" size="8" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" skipped="true" /> -</directory> diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_osclib_version b/tests/commit_fixtures/osctest/allstates/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_package b/tests/commit_fixtures/osctest/allstates/.osc/_package deleted file mode 100644 index 9d1ec82..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -allstates diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_project b/tests/commit_fixtures/osctest/allstates/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_to_be_added b/tests/commit_fixtures/osctest/allstates/.osc/_to_be_added deleted file mode 100644 index cd0a2fe..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_to_be_added +++ /dev/null @@ -1,2 +0,0 @@ -add -missing diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_to_be_deleted b/tests/commit_fixtures/osctest/allstates/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/commit_fixtures/osctest/allstates/.osc/foo b/tests/commit_fixtures/osctest/allstates/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/allstates/.osc/merge b/tests/commit_fixtures/osctest/allstates/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/allstates/.osc/missing b/tests/commit_fixtures/osctest/allstates/.osc/missing deleted file mode 100644 index 33e45d5..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/missing +++ /dev/null @@ -1 +0,0 @@ -missing diff --git a/tests/commit_fixtures/osctest/allstates/.osc/nochange b/tests/commit_fixtures/osctest/allstates/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/allstates/.osc/test b/tests/commit_fixtures/osctest/allstates/.osc/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/commit_fixtures/osctest/allstates/add b/tests/commit_fixtures/osctest/allstates/add deleted file mode 100644 index b242c36..0000000 --- a/tests/commit_fixtures/osctest/allstates/add +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tests/commit_fixtures/osctest/allstates/exists b/tests/commit_fixtures/osctest/allstates/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/allstates/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/allstates/missing b/tests/commit_fixtures/osctest/allstates/missing deleted file mode 100644 index feae347..0000000 --- a/tests/commit_fixtures/osctest/allstates/missing +++ /dev/null @@ -1 +0,0 @@ -replaced diff --git a/tests/commit_fixtures/osctest/allstates/nochange b/tests/commit_fixtures/osctest/allstates/nochange deleted file mode 100644 index 34d6872..0000000 --- a/tests/commit_fixtures/osctest/allstates/nochange +++ /dev/null @@ -1 +0,0 @@ -This file did change. diff --git a/tests/commit_fixtures/osctest/allstates/test b/tests/commit_fixtures/osctest/allstates/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/commit_fixtures/osctest/allstates/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/commit_fixtures/osctest/branch/.osc/_apiurl b/tests/commit_fixtures/osctest/branch/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/branch/.osc/_files b/tests/commit_fixtures/osctest/branch/.osc/_files deleted file mode 100644 index 8cbc407..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="unix" rev="9afa23b484de05e28364b18de7bb1432" srcmd5="9afa23b484de05e28364b18de7bb1432"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="cd21541fe2442d3d324a6d6103752913" package="unique" project="btest" srcmd5="b63634ab40861fdb8b44e5f4f459c621" /> - <entry md5="75d884cf1d235180faec5acb63063972" mtime="1283525196" name="simple" size="21" /> -</directory> diff --git a/tests/commit_fixtures/osctest/branch/.osc/_meta b/tests/commit_fixtures/osctest/branch/.osc/_meta deleted file mode 100644 index 2a9b220..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_meta +++ /dev/null @@ -1,5 +0,0 @@ -<package project="home:Admin" name="unix"> - <title/> - <description>This package was branched from btest in order to ...</description> - <person role="maintainer" userid="Admin"/> -</package> diff --git a/tests/commit_fixtures/osctest/branch/.osc/_osclib_version b/tests/commit_fixtures/osctest/branch/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/branch/.osc/_package b/tests/commit_fixtures/osctest/branch/.osc/_package deleted file mode 100644 index 80858c1..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -branch diff --git a/tests/commit_fixtures/osctest/branch/.osc/_project b/tests/commit_fixtures/osctest/branch/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/commit_fixtures/osctest/branch/.osc/simple b/tests/commit_fixtures/osctest/branch/.osc/simple deleted file mode 100644 index f425d9a..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/simple +++ /dev/null @@ -1 +0,0 @@ -imple modified file. diff --git a/tests/commit_fixtures/osctest/branch/cfilesremote b/tests/commit_fixtures/osctest/branch/cfilesremote deleted file mode 100644 index 5fe6f29..0000000 --- a/tests/commit_fixtures/osctest/branch/cfilesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="branch" rev="5" srcmd5="1d4bbfa2655ab3982074226e16e1e5ff" vrev="5"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="87ea02aede261b0267aabaa97c756e7a" /> - <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" /> - <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" /> -</directory> diff --git a/tests/commit_fixtures/osctest/branch/files b/tests/commit_fixtures/osctest/branch/files deleted file mode 100644 index 1f37d41..0000000 --- a/tests/commit_fixtures/osctest/branch/files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="branch" rev="87ea02aede261b0267aabaa97c756e7a" srcmd5="87ea02aede261b0267aabaa97c756e7a"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" /> - <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" /> -</directory> diff --git a/tests/commit_fixtures/osctest/branch/filesremote b/tests/commit_fixtures/osctest/branch/filesremote deleted file mode 100644 index 1bfc91b..0000000 --- a/tests/commit_fixtures/osctest/branch/filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="branch" rev="6" srcmd5="cd21541fe2442d3d324a6d6103752913" vrev="6"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="cd21541fe2442d3d324a6d6103752913" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="9afa23b484de05e28364b18de7bb1432" /> - <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" skipped="true" /> - <entry md5="75d884cf1d235180faec5acb63063972" mtime="1283525196" name="simple" size="21" /> -</directory> diff --git a/tests/commit_fixtures/osctest/branch/simple b/tests/commit_fixtures/osctest/branch/simple deleted file mode 100644 index 60627a5..0000000 --- a/tests/commit_fixtures/osctest/branch/simple +++ /dev/null @@ -1 +0,0 @@ -simple modified file. diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_apiurl b/tests/commit_fixtures/osctest/conflict/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_files b/tests/commit_fixtures/osctest/conflict/.osc/_files deleted file mode 100644 index a67ff42..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/commit_fixtures/osctest/conflict/.osc/_in_conflict b/tests/commit_fixtures/osctest/conflict/.osc/_in_conflict deleted file mode 100644 index a00af07..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -merge diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_osclib_version b/tests/commit_fixtures/osctest/conflict/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_package b/tests/commit_fixtures/osctest/conflict/.osc/_package deleted file mode 100644 index 783a0ef..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -conflict
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_project b/tests/commit_fixtures/osctest/conflict/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/conflict/.osc/foo b/tests/commit_fixtures/osctest/conflict/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/conflict/.osc/merge b/tests/commit_fixtures/osctest/conflict/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/conflict/.osc/nochange b/tests/commit_fixtures/osctest/conflict/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/conflict/foo b/tests/commit_fixtures/osctest/conflict/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/conflict/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/conflict/merge b/tests/commit_fixtures/osctest/conflict/merge deleted file mode 100644 index f4ff164..0000000 --- a/tests/commit_fixtures/osctest/conflict/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it possible -to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/conflict/nochange b/tests/commit_fixtures/osctest/conflict/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/conflict/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/delete/.osc/_apiurl b/tests/commit_fixtures/osctest/delete/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/delete/.osc/_files b/tests/commit_fixtures/osctest/delete/.osc/_files deleted file mode 100644 index b8bf188..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="delete" 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/commit_fixtures/osctest/delete/.osc/_osclib_version b/tests/commit_fixtures/osctest/delete/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/delete/.osc/_package b/tests/commit_fixtures/osctest/delete/.osc/_package deleted file mode 100644 index c8b1b42..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -delete diff --git a/tests/commit_fixtures/osctest/delete/.osc/_project b/tests/commit_fixtures/osctest/delete/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/delete/.osc/_to_be_deleted b/tests/commit_fixtures/osctest/delete/.osc/_to_be_deleted deleted file mode 100644 index 55aa746..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -nochange diff --git a/tests/commit_fixtures/osctest/delete/.osc/foo b/tests/commit_fixtures/osctest/delete/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/delete/.osc/merge b/tests/commit_fixtures/osctest/delete/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/delete/.osc/nochange b/tests/commit_fixtures/osctest/delete/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/delete/exists b/tests/commit_fixtures/osctest/delete/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/delete/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/delete/foo b/tests/commit_fixtures/osctest/delete/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/delete/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/delete/merge b/tests/commit_fixtures/osctest/delete/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/delete/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_apiurl b/tests/commit_fixtures/osctest/multiple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_files b/tests/commit_fixtures/osctest/multiple/.osc/_files deleted file mode 100644 index 9df02ca..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_files +++ /dev/null @@ -1,6 +0,0 @@ -<directory name="multiple" 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" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_osclib_version b/tests/commit_fixtures/osctest/multiple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_package b/tests/commit_fixtures/osctest/multiple/.osc/_package deleted file mode 100644 index 5c4139d..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -multiple diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_project b/tests/commit_fixtures/osctest/multiple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_to_be_added b/tests/commit_fixtures/osctest/multiple/.osc/_to_be_added deleted file mode 100644 index 91e4e3d..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_to_be_added +++ /dev/null @@ -1,2 +0,0 @@ -add -add2 diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_to_be_deleted b/tests/commit_fixtures/osctest/multiple/.osc/_to_be_deleted deleted file mode 100644 index cf978bc..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_to_be_deleted +++ /dev/null @@ -1,2 +0,0 @@ -foo -merge diff --git a/tests/commit_fixtures/osctest/multiple/.osc/foo b/tests/commit_fixtures/osctest/multiple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/multiple/.osc/merge b/tests/commit_fixtures/osctest/multiple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/multiple/.osc/nochange b/tests/commit_fixtures/osctest/multiple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/multiple/.osc/test b/tests/commit_fixtures/osctest/multiple/.osc/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/commit_fixtures/osctest/multiple/add b/tests/commit_fixtures/osctest/multiple/add deleted file mode 100644 index b242c36..0000000 --- a/tests/commit_fixtures/osctest/multiple/add +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tests/commit_fixtures/osctest/multiple/add2 b/tests/commit_fixtures/osctest/multiple/add2 deleted file mode 100644 index 4755903..0000000 --- a/tests/commit_fixtures/osctest/multiple/add2 +++ /dev/null @@ -1 +0,0 @@ -add2 diff --git a/tests/commit_fixtures/osctest/multiple/exists b/tests/commit_fixtures/osctest/multiple/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/multiple/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/multiple/nochange b/tests/commit_fixtures/osctest/multiple/nochange deleted file mode 100644 index 34d6872..0000000 --- a/tests/commit_fixtures/osctest/multiple/nochange +++ /dev/null @@ -1 +0,0 @@ -This file did change. diff --git a/tests/commit_fixtures/osctest/multiple/test b/tests/commit_fixtures/osctest/multiple/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/commit_fixtures/osctest/multiple/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_apiurl b/tests/commit_fixtures/osctest/nochanges/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_files b/tests/commit_fixtures/osctest/nochanges/.osc/_files deleted file mode 100644 index fee086c..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="nochanges" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" skipped="True" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> -</directory> diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_osclib_version b/tests/commit_fixtures/osctest/nochanges/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_package b/tests/commit_fixtures/osctest/nochanges/.osc/_package deleted file mode 100644 index 40b16a9..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -nochanges diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_project b/tests/commit_fixtures/osctest/nochanges/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/merge b/tests/commit_fixtures/osctest/nochanges/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/nochange b/tests/commit_fixtures/osctest/nochanges/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/nochanges/exists b/tests/commit_fixtures/osctest/nochanges/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/nochanges/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/nochanges/nochange b/tests/commit_fixtures/osctest/nochanges/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/nochanges/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/simple/.osc/_apiurl b/tests/commit_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/simple/.osc/_files b/tests/commit_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index d2e3da5..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/commit_fixtures/osctest/simple/.osc/_osclib_version b/tests/commit_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/simple/.osc/_package b/tests/commit_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/simple/.osc/_project b/tests/commit_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/simple/.osc/foo b/tests/commit_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/simple/.osc/merge b/tests/commit_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/simple/.osc/nochange b/tests/commit_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/simple/exists b/tests/commit_fixtures/osctest/simple/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/simple/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/simple/foo b/tests/commit_fixtures/osctest/simple/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/simple/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/simple/merge b/tests/commit_fixtures/osctest/simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/simple/nochange b/tests/commit_fixtures/osctest/simple/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/commit_fixtures/osctest/simple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/commit_fixtures/testAddedMissing_cfilesremote b/tests/commit_fixtures/testAddedMissing_cfilesremote deleted file mode 100644 index a9c946e..0000000 --- a/tests/commit_fixtures/testAddedMissing_cfilesremote +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="added_missing" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="14758f1afd44c09b7992073ccf00b43d" mtime="1292622742" name="bar" size="7" /> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" /> -</directory> diff --git a/tests/commit_fixtures/testAddedMissing_filesremote b/tests/commit_fixtures/testAddedMissing_filesremote deleted file mode 100644 index 03c7d89..0000000 --- a/tests/commit_fixtures/testAddedMissing_filesremote +++ /dev/null @@ -1,3 +0,0 @@ -<directory name="added_missing" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" /> -</directory> diff --git a/tests/commit_fixtures/testAddedMissing_lfilelist b/tests/commit_fixtures/testAddedMissing_lfilelist deleted file mode 100644 index c846f12..0000000 --- a/tests/commit_fixtures/testAddedMissing_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="14758f1afd44c09b7992073ccf00b43d" name="bar" /><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testAddedMissing_missingfilelist b/tests/commit_fixtures/testAddedMissing_missingfilelist deleted file mode 100644 index 7070186..0000000 --- a/tests/commit_fixtures/testAddedMissing_missingfilelist +++ /dev/null @@ -1,3 +0,0 @@ -<directory error="missing" name="added_missing"> - <entry md5="14758f1afd44c09b7992073ccf00b43d" name="bar" /> -</directory> diff --git a/tests/commit_fixtures/testAddfile_cfilesremote b/tests/commit_fixtures/testAddfile_cfilesremote deleted file mode 100644 index 47538b0..0000000 --- a/tests/commit_fixtures/testAddfile_cfilesremote +++ /dev/null @@ -1,6 +0,0 @@ -<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" 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="b423d194c75e59ee4d8d2e07ba24323d" mtime="1111111111" name="add" size="11" /> -</directory> diff --git a/tests/commit_fixtures/testAddfile_filesremote b/tests/commit_fixtures/testAddfile_filesremote deleted file mode 100644 index d2e3da5..0000000 --- a/tests/commit_fixtures/testAddfile_filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<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/commit_fixtures/testAddfile_lfilelist b/tests/commit_fixtures/testAddfile_lfilelist deleted file mode 100644 index c0c079b..0000000 --- a/tests/commit_fixtures/testAddfile_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="7efa70f68983fad1cf487f69dedf93e9" name="nochange" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testAddfile_missingfilelist b/tests/commit_fixtures/testAddfile_missingfilelist deleted file mode 100644 index ac41f20..0000000 --- a/tests/commit_fixtures/testAddfile_missingfilelist +++ /dev/null @@ -1,3 +0,0 @@ -<directory error="missing" name="add"> - <entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /> -</directory> diff --git a/tests/commit_fixtures/testAllStates_cfilesremote b/tests/commit_fixtures/testAllStates_cfilesremote deleted file mode 100644 index 18e5fa2..0000000 --- a/tests/commit_fixtures/testAllStates_cfilesremote +++ /dev/null @@ -1,8 +0,0 @@ -<directory name="allstates" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="3333333333" name="add" size="11" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="d908d26cac8092d475f40a5179ca6347" mtime="4444444444" name="missing" size="9" /> - <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="2222222222" name="nochange" size="22" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" /> -</directory> diff --git a/tests/commit_fixtures/testAllStates_expfiles b/tests/commit_fixtures/testAllStates_expfiles deleted file mode 100644 index 692f070..0000000 --- a/tests/commit_fixtures/testAllStates_expfiles +++ /dev/null @@ -1,8 +0,0 @@ -<directory name="allstates" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="3333333333" name="add" size="11" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="d908d26cac8092d475f40a5179ca6347" mtime="4444444444" name="missing" size="9" /> - <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="2222222222" name="nochange" size="22" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" skipped="true" /> -</directory> diff --git a/tests/commit_fixtures/testAllStates_filesremote b/tests/commit_fixtures/testAllStates_filesremote deleted file mode 100644 index 995a585..0000000 --- a/tests/commit_fixtures/testAllStates_filesremote +++ /dev/null @@ -1,8 +0,0 @@ -<directory name="allstates" 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="676513fde5797c3785164942c97dfec1" mtime="1283506309" name="missing" size="8" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" /> -</directory> diff --git a/tests/commit_fixtures/testAllStates_lfilelist b/tests/commit_fixtures/testAllStates_lfilelist deleted file mode 100644 index c534c8c..0000000 --- a/tests/commit_fixtures/testAllStates_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="d908d26cac8092d475f40a5179ca6347" name="missing" /><entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /><entry md5="ffffffffffffffffffffffffffffffff" name="skipped" /><entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" name="test" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testAllStates_missingfilelist b/tests/commit_fixtures/testAllStates_missingfilelist deleted file mode 100644 index d7ee788..0000000 --- a/tests/commit_fixtures/testAllStates_missingfilelist +++ /dev/null @@ -1,5 +0,0 @@ -<directory error="missing" name="allstates"> - <entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /> - <entry md5="d908d26cac8092d475f40a5179ca6347" name="missing" /> - <entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /> -</directory> diff --git a/tests/commit_fixtures/testConflictfile_filesremote b/tests/commit_fixtures/testConflictfile_filesremote deleted file mode 100644 index a67ff42..0000000 --- a/tests/commit_fixtures/testConflictfile_filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<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/commit_fixtures/testDeletefile_cfilesremote b/tests/commit_fixtures/testDeletefile_cfilesremote deleted file mode 100644 index 20ce708..0000000 --- a/tests/commit_fixtures/testDeletefile_cfilesremote +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> -</directory> diff --git a/tests/commit_fixtures/testDeletefile_filesremote b/tests/commit_fixtures/testDeletefile_filesremote deleted file mode 100644 index d2e3da5..0000000 --- a/tests/commit_fixtures/testDeletefile_filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<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/commit_fixtures/testDeletefile_lfilelist b/tests/commit_fixtures/testDeletefile_lfilelist deleted file mode 100644 index bc0f1c6..0000000 --- a/tests/commit_fixtures/testDeletefile_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testExpand_cfilesremote b/tests/commit_fixtures/testExpand_cfilesremote deleted file mode 100644 index 475cff8..0000000 --- a/tests/commit_fixtures/testExpand_cfilesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="branch" rev="7" srcmd5="1d4bbfa2655ab3982074226e16e1e5ff" vrev="7"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="87ea02aede261b0267aabaa97c756e7a" /> - <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" /> - <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" /> -</directory> diff --git a/tests/commit_fixtures/testExpand_expandedfilesremote b/tests/commit_fixtures/testExpand_expandedfilesremote deleted file mode 100644 index 1f37d41..0000000 --- a/tests/commit_fixtures/testExpand_expandedfilesremote +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="branch" rev="87ea02aede261b0267aabaa97c756e7a" srcmd5="87ea02aede261b0267aabaa97c756e7a"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" /> - <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" /> -</directory> diff --git a/tests/commit_fixtures/testExpand_filesremote b/tests/commit_fixtures/testExpand_filesremote deleted file mode 100644 index 1bfc91b..0000000 --- a/tests/commit_fixtures/testExpand_filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="branch" rev="6" srcmd5="cd21541fe2442d3d324a6d6103752913" vrev="6"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="cd21541fe2442d3d324a6d6103752913" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="9afa23b484de05e28364b18de7bb1432" /> - <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" skipped="true" /> - <entry md5="75d884cf1d235180faec5acb63063972" mtime="1283525196" name="simple" size="21" /> -</directory> diff --git a/tests/commit_fixtures/testExpand_lfilelist b/tests/commit_fixtures/testExpand_lfilelist deleted file mode 100644 index d6d37b5..0000000 --- a/tests/commit_fixtures/testExpand_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="75da7f7167c22b2b02c6879366d78ad1" name="simple" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testExpand_missingfilelist b/tests/commit_fixtures/testExpand_missingfilelist deleted file mode 100644 index f2d91e8..0000000 --- a/tests/commit_fixtures/testExpand_missingfilelist +++ /dev/null @@ -1,3 +0,0 @@ -<directory error="missing" name="branch"> - <entry md5="75da7f7167c22b2b02c6879366d78ad1" name="simple" /> -</directory> diff --git a/tests/commit_fixtures/testInterrupted_lfilelist b/tests/commit_fixtures/testInterrupted_lfilelist deleted file mode 100644 index 85e9db5..0000000 --- a/tests/commit_fixtures/testInterrupted_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="382588b92f5976de693f44c4d6df27b7" name="nochange" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testMultiple_cfilesremote b/tests/commit_fixtures/testMultiple_cfilesremote deleted file mode 100644 index e98188d..0000000 --- a/tests/commit_fixtures/testMultiple_cfilesremote +++ /dev/null @@ -1,6 +0,0 @@ -<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="1111111111" name="add" size="11" /> - <entry md5="ea467af882b32a275fe62eb05aba6ee1" mtime="0000000000" name="add2" size="5" /> - <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="2222222222" name="nochange" size="22" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/commit_fixtures/testMultiple_filesremote b/tests/commit_fixtures/testMultiple_filesremote deleted file mode 100644 index 00e4458..0000000 --- a/tests/commit_fixtures/testMultiple_filesremote +++ /dev/null @@ -1,6 +0,0 @@ -<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" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/commit_fixtures/testMultiple_lfilelist b/tests/commit_fixtures/testMultiple_lfilelist deleted file mode 100644 index cd8c43c..0000000 --- a/tests/commit_fixtures/testMultiple_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /><entry md5="ea467af882b32a275fe62eb05aba6ee1" name="add2" /><entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /><entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" name="test" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testMultiple_missingfilelist b/tests/commit_fixtures/testMultiple_missingfilelist deleted file mode 100644 index e4f6314..0000000 --- a/tests/commit_fixtures/testMultiple_missingfilelist +++ /dev/null @@ -1,5 +0,0 @@ -<directory error="missing" name="add"> - <entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /> - <entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /> - <entry md5="ea467af882b32a275fe62eb05aba6ee1" name="add2" /> -</directory> diff --git a/tests/commit_fixtures/testNoChanges_filesremote b/tests/commit_fixtures/testNoChanges_filesremote deleted file mode 100644 index a67ff42..0000000 --- a/tests/commit_fixtures/testNoChanges_filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<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/commit_fixtures/testPartial_cfilesremote b/tests/commit_fixtures/testPartial_cfilesremote deleted file mode 100644 index db75949..0000000 --- a/tests/commit_fixtures/testPartial_cfilesremote +++ /dev/null @@ -1,6 +0,0 @@ -<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="b423d194c75e59ee4d8d2e07ba24323d" mtime="1111111111" name="add" size="11" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="2222222222" name="nochange" size="22" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/commit_fixtures/testPartial_filesremote b/tests/commit_fixtures/testPartial_filesremote deleted file mode 100644 index 00e4458..0000000 --- a/tests/commit_fixtures/testPartial_filesremote +++ /dev/null @@ -1,6 +0,0 @@ -<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" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/commit_fixtures/testPartial_lfilelist b/tests/commit_fixtures/testPartial_lfilelist deleted file mode 100644 index 6da9126..0000000 --- a/tests/commit_fixtures/testPartial_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /><entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" name="test" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testPartial_missingfilelist b/tests/commit_fixtures/testPartial_missingfilelist deleted file mode 100644 index 589642c..0000000 --- a/tests/commit_fixtures/testPartial_missingfilelist +++ /dev/null @@ -1,4 +0,0 @@ -<directory error="missing" name="partial"> - <entry md5="b423d194c75e59ee4d8d2e07ba24323d" name="add" /> - <entry md5="2abd19de6a38ff2890af64f453df96b1" name="nochange" /> -</directory> diff --git a/tests/commit_fixtures/testSimple_cfilesremote b/tests/commit_fixtures/testSimple_cfilesremote deleted file mode 100644 index bc155b4..0000000 --- a/tests/commit_fixtures/testSimple_cfilesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="382588b92f5976de693f44c4d6df27b7" mtime="1282047303" name="nochange" size="41" /> -</directory> diff --git a/tests/commit_fixtures/testSimple_filesremote b/tests/commit_fixtures/testSimple_filesremote deleted file mode 100644 index d2e3da5..0000000 --- a/tests/commit_fixtures/testSimple_filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<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/commit_fixtures/testSimple_lfilelist b/tests/commit_fixtures/testSimple_lfilelist deleted file mode 100644 index 85e9db5..0000000 --- a/tests/commit_fixtures/testSimple_lfilelist +++ /dev/null @@ -1 +0,0 @@ -<directory><entry md5="0d62ceea6020d75154078a20d8c9f9ba" name="foo" /><entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" name="merge" /><entry md5="382588b92f5976de693f44c4d6df27b7" name="nochange" /></directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/testSimple_missingfilelist b/tests/commit_fixtures/testSimple_missingfilelist deleted file mode 100644 index 1c6bc68..0000000 --- a/tests/commit_fixtures/testSimple_missingfilelist +++ /dev/null @@ -1,3 +0,0 @@ -<directory error="missing" name="simple"> - <entry md5="c4eaea5dcaff13418e38e7fea151dd49" name="nochange" /> -</directory> diff --git a/tests/common.py b/tests/common.py deleted file mode 100644 index fd1d7dc..0000000 --- a/tests/common.py +++ /dev/null @@ -1,172 +0,0 @@ -import unittest -import urllib2 -import osc.core -import StringIO -import shutil -import tempfile -import os -import sys -from xml.etree import cElementTree as ET -EXPECTED_REQUESTS = [] - -class RequestWrongOrder(Exception): - """raised if an unexpected request is issued to urllib2""" - def __init__(self, url, exp_url, method, exp_method): - Exception.__init__(self) - self.url = url - self.exp_url = exp_url - self.method = method - self.exp_method = exp_method - - def __str__(self): - return '%s, %s, %s, %s' % (self.url, self.exp_url, self.method, self.exp_method) - -class RequestDataMismatch(Exception): - """raised if POSTed or PUTed data doesn't match with the expected data""" - def __init__(self, url, got, exp): - self.url = url - self.got = got - self.exp = exp - - def __str__(self): - return '%s, %s, %s' % (self.url, self.got, self.exp) - -class MyHTTPHandler(urllib2.HTTPHandler): - def __init__(self, exp_requests, fixtures_dir): - urllib2.HTTPHandler.__init__(self) - self.__exp_requests = exp_requests - self.__fixtures_dir = fixtures_dir - - def http_open(self, req): - r = self.__exp_requests.pop(0) - if req.get_full_url() != r[1] or req.get_method() != r[0]: - raise RequestWrongOrder(req.get_full_url(), r[1], req.get_method(), r[0]) - if req.get_method() in ('GET', 'DELETE'): - return self.__mock_GET(r[1], **r[2]) - elif req.get_method() in ('PUT', 'POST'): - return self.__mock_PUT(req, **r[2]) - - def __mock_GET(self, fullurl, **kwargs): - return self.__get_response(fullurl, **kwargs) - - def __mock_PUT(self, req, **kwargs): - exp = kwargs.get('exp', None) - if exp is not None and kwargs.has_key('expfile'): - raise RuntimeError('either specify exp or expfile') - elif kwargs.has_key('expfile'): - exp = open(os.path.join(self.__fixtures_dir, kwargs['expfile']), 'r').read() - elif exp is None: - raise RuntimeError('exp or expfile required') - if exp is not None: - if req.get_data() != exp: - raise RequestDataMismatch(req.get_full_url(), repr(req.get_data()), repr(exp)) - return self.__get_response(req.get_full_url(), **kwargs) - - def __get_response(self, url, **kwargs): - f = None - if kwargs.has_key('exception'): - raise kwargs['exception'] - if not kwargs.has_key('text') and kwargs.has_key('file'): - f = StringIO.StringIO(open(os.path.join(self.__fixtures_dir, kwargs['file']), 'r').read()) - elif kwargs.has_key('text') and not kwargs.has_key('file'): - f = StringIO.StringIO(kwargs['text']) - else: - raise RuntimeError('either specify text or file') - resp = urllib2.addinfourl(f, {}, url) - resp.code = kwargs.get('code', 200) - resp.msg = '' - return resp - -def urldecorator(method, fullurl, **kwargs): - def decorate(test_method): - def wrapped_test_method(*args): - addExpectedRequest(method, fullurl, **kwargs) - test_method(*args) - # "rename" method otherwise we cannot specify a TestCaseClass.testName - # cmdline arg when using unittest.main() - wrapped_test_method.__name__ = test_method.__name__ - return wrapped_test_method - return decorate - -def GET(fullurl, **kwargs): - return urldecorator('GET', fullurl, **kwargs) - -def PUT(fullurl, **kwargs): - return urldecorator('PUT', fullurl, **kwargs) - -def POST(fullurl, **kwargs): - return urldecorator('POST', fullurl, **kwargs) - -def DELETE(fullurl, **kwargs): - return urldecorator('DELETE', fullurl, **kwargs) - -def addExpectedRequest(method, url, **kwargs): - global EXPECTED_REQUESTS - EXPECTED_REQUESTS.append((method, url, kwargs)) - -class OscTestCase(unittest.TestCase): - def setUp(self, copytree=True): - oscrc = os.path.join(self._get_fixtures_dir(), 'oscrc') - osc.core.conf.get_config(override_conffile=oscrc, - override_no_keyring=True, override_no_gnome_keyring=True) - os.environ['OSC_CONFIG'] = oscrc - - self.tmpdir = tempfile.mkdtemp(prefix='osc_test') - if copytree: - shutil.copytree(os.path.join(self._get_fixtures_dir(), 'osctest'), os.path.join(self.tmpdir, 'osctest')) - global EXPECTED_REQUESTS - EXPECTED_REQUESTS = [] - osc.core.conf._build_opener = lambda u: urllib2.build_opener(MyHTTPHandler(EXPECTED_REQUESTS, self._get_fixtures_dir())) - self.stdout = sys.stdout - sys.stdout = StringIO.StringIO() - - def tearDown(self): - self.assertTrue(len(EXPECTED_REQUESTS) == 0) - sys.stdout = self.stdout - try: - shutil.rmtree(self.tmpdir) - except: - pass - - def _get_fixtures_dir(self): - raise NotImplementedError('subclasses should implement this method') - - def _change_to_pkg(self, name): - os.chdir(os.path.join(self.tmpdir, 'osctest', name)) - - def _check_list(self, fname, exp): - fname = os.path.join('.osc', fname) - self.assertTrue(os.path.exists(fname)) - self.assertEqual(open(fname, 'r').read(), exp) - - def _check_addlist(self, exp): - self._check_list('_to_be_added', exp) - - def _check_deletelist(self, exp): - self._check_list('_to_be_deleted', exp) - - def _check_conflictlist(self, exp): - self._check_list('_in_conflict', exp) - - def _check_status(self, p, fname, exp): - self.assertEqual(p.status(fname), exp) - - def _check_digests(self, fname, *skipfiles): - fname = os.path.join(self._get_fixtures_dir(), fname) - self.assertEqual(open(os.path.join('.osc', '_files'), 'r').read(), open(fname, 'r').read()) - root = ET.parse(fname).getroot() - for i in root.findall('entry'): - if i.get('name') in skipfiles: - continue - self.assertTrue(os.path.exists(os.path.join('.osc', i.get('name')))) - self.assertEqual(osc.core.dgst(os.path.join('.osc', i.get('name'))), i.get('md5')) - - def assertEqualMultiline(self, got, exp): - if (got + exp).find('\n') == -1: - self.assertEqual(got, exp) - else: - start_delim = "\n" + (" 8< ".join(["-----"] * 8)) + "\n" - end_delim = "\n" + (" >8 ".join(["-----"] * 8)) + "\n\n" - self.assertEqual(got, exp, - "got:" + start_delim + got + end_delim + - "expected:" + start_delim + exp + end_delim) diff --git a/tests/deletefile_fixtures/oscrc b/tests/deletefile_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/deletefile_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/deletefile_fixtures/osctest/.osc/_apiurl b/tests/deletefile_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/deletefile_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/deletefile_fixtures/osctest/.osc/_packages b/tests/deletefile_fixtures/osctest/.osc/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/deletefile_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/deletefile_fixtures/osctest/.osc/_project b/tests/deletefile_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/deletefile_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_apiurl b/tests/deletefile_fixtures/osctest/already_deleted/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_files b/tests/deletefile_fixtures/osctest/already_deleted/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/deletefile_fixtures/osctest/already_deleted/.osc/_osclib_version b/tests/deletefile_fixtures/osctest/already_deleted/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_package b/tests/deletefile_fixtures/osctest/already_deleted/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_project b/tests/deletefile_fixtures/osctest/already_deleted/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_to_be_added b/tests/deletefile_fixtures/osctest/already_deleted/.osc/_to_be_added deleted file mode 100644 index 1592423..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_to_be_deleted b/tests/deletefile_fixtures/osctest/already_deleted/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/foo b/tests/deletefile_fixtures/osctest/already_deleted/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/merge b/tests/deletefile_fixtures/osctest/already_deleted/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/already_deleted/.osc/nochange b/tests/deletefile_fixtures/osctest/already_deleted/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/deletefile_fixtures/osctest/already_deleted/merge b/tests/deletefile_fixtures/osctest/already_deleted/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/already_deleted/nochange b/tests/deletefile_fixtures/osctest/already_deleted/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/deletefile_fixtures/osctest/already_deleted/toadd1 b/tests/deletefile_fixtures/osctest/already_deleted/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/deletefile_fixtures/osctest/already_deleted/toadd2 b/tests/deletefile_fixtures/osctest/already_deleted/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/deletefile_fixtures/osctest/already_deleted/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/_apiurl b/tests/deletefile_fixtures/osctest/conflict/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/_files b/tests/deletefile_fixtures/osctest/conflict/.osc/_files deleted file mode 100644 index 6fc0c34..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="conflict" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" 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" /> -</directory> diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/_in_conflict b/tests/deletefile_fixtures/osctest/conflict/.osc/_in_conflict deleted file mode 100644 index 257cc56..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/_osclib_version b/tests/deletefile_fixtures/osctest/conflict/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/_package b/tests/deletefile_fixtures/osctest/conflict/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/_project b/tests/deletefile_fixtures/osctest/conflict/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/_to_be_added b/tests/deletefile_fixtures/osctest/conflict/.osc/_to_be_added deleted file mode 100644 index 1592423..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/foo b/tests/deletefile_fixtures/osctest/conflict/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/merge b/tests/deletefile_fixtures/osctest/conflict/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/nochange b/tests/deletefile_fixtures/osctest/conflict/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/deletefile_fixtures/osctest/conflict/foo b/tests/deletefile_fixtures/osctest/conflict/foo deleted file mode 100644 index ad9621d..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/foo +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< foo.mine -This is no test. -======= -This is a simple test. ->>>>>>> foo.r2 diff --git a/tests/deletefile_fixtures/osctest/conflict/foo.mine b/tests/deletefile_fixtures/osctest/conflict/foo.mine deleted file mode 100644 index 3543613..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/foo.mine +++ /dev/null @@ -1 +0,0 @@ -This is no test. diff --git a/tests/deletefile_fixtures/osctest/conflict/foo.r2 b/tests/deletefile_fixtures/osctest/conflict/foo.r2 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/foo.r2 +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/deletefile_fixtures/osctest/conflict/merge b/tests/deletefile_fixtures/osctest/conflict/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/conflict/nochange b/tests/deletefile_fixtures/osctest/conflict/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/deletefile_fixtures/osctest/conflict/toadd1 b/tests/deletefile_fixtures/osctest/conflict/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/deletefile_fixtures/osctest/conflict/toadd2 b/tests/deletefile_fixtures/osctest/conflict/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/_apiurl b/tests/deletefile_fixtures/osctest/delete/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/_files b/tests/deletefile_fixtures/osctest/delete/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/deletefile_fixtures/osctest/delete/.osc/_osclib_version b/tests/deletefile_fixtures/osctest/delete/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/_package b/tests/deletefile_fixtures/osctest/delete/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/_project b/tests/deletefile_fixtures/osctest/delete/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/_to_be_added b/tests/deletefile_fixtures/osctest/delete/.osc/_to_be_added deleted file mode 100644 index 1592423..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/_to_be_deleted b/tests/deletefile_fixtures/osctest/delete/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/foo b/tests/deletefile_fixtures/osctest/delete/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/merge b/tests/deletefile_fixtures/osctest/delete/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/delete/.osc/nochange b/tests/deletefile_fixtures/osctest/delete/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/deletefile_fixtures/osctest/delete/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/deletefile_fixtures/osctest/delete/merge b/tests/deletefile_fixtures/osctest/delete/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/delete/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/delete/nochange b/tests/deletefile_fixtures/osctest/delete/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/deletefile_fixtures/osctest/delete/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/deletefile_fixtures/osctest/delete/toadd2 b/tests/deletefile_fixtures/osctest/delete/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/deletefile_fixtures/osctest/delete/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/deletefile_fixtures/osctest/replace/.osc/_apiurl b/tests/deletefile_fixtures/osctest/replace/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/deletefile_fixtures/osctest/replace/.osc/_files b/tests/deletefile_fixtures/osctest/replace/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/deletefile_fixtures/osctest/replace/.osc/_osclib_version b/tests/deletefile_fixtures/osctest/replace/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/deletefile_fixtures/osctest/replace/.osc/_package b/tests/deletefile_fixtures/osctest/replace/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/replace/.osc/_project b/tests/deletefile_fixtures/osctest/replace/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/replace/.osc/_to_be_added b/tests/deletefile_fixtures/osctest/replace/.osc/_to_be_added deleted file mode 100644 index d530a9a..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/_to_be_added +++ /dev/null @@ -1,2 +0,0 @@ -toadd1 -merge diff --git a/tests/deletefile_fixtures/osctest/replace/.osc/foo b/tests/deletefile_fixtures/osctest/replace/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/deletefile_fixtures/osctest/replace/.osc/merge b/tests/deletefile_fixtures/osctest/replace/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/replace/.osc/nochange b/tests/deletefile_fixtures/osctest/replace/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/deletefile_fixtures/osctest/replace/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/deletefile_fixtures/osctest/replace/foo b/tests/deletefile_fixtures/osctest/replace/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/deletefile_fixtures/osctest/replace/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/deletefile_fixtures/osctest/replace/merge b/tests/deletefile_fixtures/osctest/replace/merge deleted file mode 100644 index feae347..0000000 --- a/tests/deletefile_fixtures/osctest/replace/merge +++ /dev/null @@ -1 +0,0 @@ -replaced diff --git a/tests/deletefile_fixtures/osctest/replace/nochange b/tests/deletefile_fixtures/osctest/replace/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/deletefile_fixtures/osctest/replace/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/deletefile_fixtures/osctest/replace/toadd1 b/tests/deletefile_fixtures/osctest/replace/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/deletefile_fixtures/osctest/replace/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/deletefile_fixtures/osctest/replace/toadd2 b/tests/deletefile_fixtures/osctest/replace/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/deletefile_fixtures/osctest/replace/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/_apiurl b/tests/deletefile_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/_files b/tests/deletefile_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index eb2a44c..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,7 +0,0 @@ -<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" /> - <entry md5="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" mtime="123456789" name="skipped" size="225" skipped="true" /> - <entry md5="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" mtime="012345678" name="skipped_exists" size="22" skipped="true" /> -</directory> diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/_osclib_version b/tests/deletefile_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/_package b/tests/deletefile_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/_project b/tests/deletefile_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/_to_be_added b/tests/deletefile_fixtures/osctest/simple/.osc/_to_be_added deleted file mode 100644 index 1592423..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/foo b/tests/deletefile_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/merge b/tests/deletefile_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/simple/.osc/nochange b/tests/deletefile_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/deletefile_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/deletefile_fixtures/osctest/simple/foo b/tests/deletefile_fixtures/osctest/simple/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/deletefile_fixtures/osctest/simple/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/deletefile_fixtures/osctest/simple/merge b/tests/deletefile_fixtures/osctest/simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/deletefile_fixtures/osctest/simple/nochange b/tests/deletefile_fixtures/osctest/simple/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/deletefile_fixtures/osctest/simple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/deletefile_fixtures/osctest/simple/skipped_exists b/tests/deletefile_fixtures/osctest/simple/skipped_exists deleted file mode 100644 index 323fae0..0000000 --- a/tests/deletefile_fixtures/osctest/simple/skipped_exists +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/deletefile_fixtures/osctest/simple/toadd1 b/tests/deletefile_fixtures/osctest/simple/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/deletefile_fixtures/osctest/simple/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/deletefile_fixtures/osctest/simple/toadd2 b/tests/deletefile_fixtures/osctest/simple/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/deletefile_fixtures/osctest/simple/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/difffile_fixtures/oscrc b/tests/difffile_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/difffile_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/difffile_fixtures/osctest/.osc/_apiurl b/tests/difffile_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/difffile_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/difffile_fixtures/osctest/.osc/_packages b/tests/difffile_fixtures/osctest/.osc/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/difffile_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/difffile_fixtures/osctest/.osc/_project b/tests/difffile_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/difffile_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/difffile_fixtures/osctest/binary/.osc/_apiurl b/tests/difffile_fixtures/osctest/binary/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/difffile_fixtures/osctest/binary/.osc/_files b/tests/difffile_fixtures/osctest/binary/.osc/_files deleted file mode 100644 index 2c82894..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="binary" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="8f618462e00017108b4146a29e074bdf" mtime="1111111111" name="binary" size="18" /> - <entry md5="ee813c93cb5730dce38976695634482f" mtime="1111111111" name="binary_deleted" size="26" /> -</directory> diff --git a/tests/difffile_fixtures/osctest/binary/.osc/_osclib_version b/tests/difffile_fixtures/osctest/binary/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/difffile_fixtures/osctest/binary/.osc/_package b/tests/difffile_fixtures/osctest/binary/.osc/_package deleted file mode 100644 index a9128c2..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -binary diff --git a/tests/difffile_fixtures/osctest/binary/.osc/_project b/tests/difffile_fixtures/osctest/binary/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/difffile_fixtures/osctest/binary/.osc/_to_be_added b/tests/difffile_fixtures/osctest/binary/.osc/_to_be_added deleted file mode 100644 index 075a151..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -binary_added diff --git a/tests/difffile_fixtures/osctest/binary/.osc/_to_be_deleted b/tests/difffile_fixtures/osctest/binary/.osc/_to_be_deleted deleted file mode 100644 index 705639e..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -binary_deleted diff --git a/tests/difffile_fixtures/osctest/binary/.osc/binary b/tests/difffile_fixtures/osctest/binary/.osc/binary Binary files differdeleted file mode 100644 index 727c366..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/binary +++ /dev/null diff --git a/tests/difffile_fixtures/osctest/binary/.osc/binary_deleted b/tests/difffile_fixtures/osctest/binary/.osc/binary_deleted Binary files differdeleted file mode 100644 index 17e35ec..0000000 --- a/tests/difffile_fixtures/osctest/binary/.osc/binary_deleted +++ /dev/null diff --git a/tests/difffile_fixtures/osctest/binary/binary b/tests/difffile_fixtures/osctest/binary/binary Binary files differdeleted file mode 100644 index 5868978..0000000 --- a/tests/difffile_fixtures/osctest/binary/binary +++ /dev/null diff --git a/tests/difffile_fixtures/osctest/binary/binary_added b/tests/difffile_fixtures/osctest/binary/binary_added Binary files differdeleted file mode 100644 index 188a937..0000000 --- a/tests/difffile_fixtures/osctest/binary/binary_added +++ /dev/null diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_apiurl b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_files b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/difffile_fixtures/osctest/remote_localdelete/.osc/_osclib_version b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_package b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_package deleted file mode 100644 index 5d09f91..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -remote_localdelete diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_project b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_to_be_deleted b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_to_be_deleted deleted file mode 100644 index a00af07..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -merge diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/foo b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/merge b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/nochange b/tests/difffile_fixtures/osctest/remote_localdelete/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/foo b/tests/difffile_fixtures/osctest/remote_localdelete/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/nochange b/tests/difffile_fixtures/osctest/remote_localdelete/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/difffile_fixtures/osctest/remote_localdelete/toadd2 b/tests/difffile_fixtures/osctest/remote_localdelete/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/difffile_fixtures/osctest/remote_localdelete/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_apiurl b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_files b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_files deleted file mode 100644 index 7c4480a..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_files +++ /dev/null @@ -1,6 +0,0 @@ -<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" /> - <entry md5="b1b642cdbacf9956104f8565e297ed00" mtime="1283246089" name="binary" size="27" /> -</directory> diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_osclib_version b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_package b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_package deleted file mode 100644 index 6c6c3a8..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -remote_localmodified diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_project b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/binary b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/binary Binary files differdeleted file mode 100644 index 5868978..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/binary +++ /dev/null diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/foo b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/merge b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/nochange b/tests/difffile_fixtures/osctest/remote_localmodified/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/binary b/tests/difffile_fixtures/osctest/remote_localmodified/binary Binary files differdeleted file mode 100644 index ff2abf9..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/binary +++ /dev/null diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/foo b/tests/difffile_fixtures/osctest/remote_localmodified/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/merge b/tests/difffile_fixtures/osctest/remote_localmodified/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/nochange b/tests/difffile_fixtures/osctest/remote_localmodified/nochange deleted file mode 100644 index a64acb7..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change. -oh it does diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/toadd1 b/tests/difffile_fixtures/osctest/remote_localmodified/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/difffile_fixtures/osctest/remote_localmodified/toadd2 b/tests/difffile_fixtures/osctest/remote_localmodified/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/difffile_fixtures/osctest/remote_localmodified/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/difffile_fixtures/osctest/remote_simple/.osc/_apiurl b/tests/difffile_fixtures/osctest/remote_simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/difffile_fixtures/osctest/remote_simple/.osc/_files b/tests/difffile_fixtures/osctest/remote_simple/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/difffile_fixtures/osctest/remote_simple/.osc/_osclib_version b/tests/difffile_fixtures/osctest/remote_simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/difffile_fixtures/osctest/remote_simple/.osc/_package b/tests/difffile_fixtures/osctest/remote_simple/.osc/_package deleted file mode 100644 index 7894c46..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -remote_simple diff --git a/tests/difffile_fixtures/osctest/remote_simple/.osc/_project b/tests/difffile_fixtures/osctest/remote_simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/difffile_fixtures/osctest/remote_simple/.osc/_to_be_added b/tests/difffile_fixtures/osctest/remote_simple/.osc/_to_be_added deleted file mode 100644 index 1592423..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/difffile_fixtures/osctest/remote_simple/.osc/foo b/tests/difffile_fixtures/osctest/remote_simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/remote_simple/.osc/merge b/tests/difffile_fixtures/osctest/remote_simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/remote_simple/.osc/nochange b/tests/difffile_fixtures/osctest/remote_simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/difffile_fixtures/osctest/remote_simple/binary b/tests/difffile_fixtures/osctest/remote_simple/binary Binary files differdeleted file mode 100644 index 5868978..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/binary +++ /dev/null diff --git a/tests/difffile_fixtures/osctest/remote_simple/foo b/tests/difffile_fixtures/osctest/remote_simple/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/remote_simple/merge b/tests/difffile_fixtures/osctest/remote_simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/remote_simple/nochange b/tests/difffile_fixtures/osctest/remote_simple/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/difffile_fixtures/osctest/remote_simple/toadd1 b/tests/difffile_fixtures/osctest/remote_simple/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/difffile_fixtures/osctest/remote_simple/toadd2 b/tests/difffile_fixtures/osctest/remote_simple/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_apiurl b/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_files b/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/difffile_fixtures/osctest/remote_simple_noadd/.osc/_osclib_version b/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_package b/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_package deleted file mode 100644 index 6a70072..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -remote_simple_noadd diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_project b/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/foo b/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/merge b/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/nochange b/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/foo b/tests/difffile_fixtures/osctest/remote_simple_noadd/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/merge b/tests/difffile_fixtures/osctest/remote_simple_noadd/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/nochange b/tests/difffile_fixtures/osctest/remote_simple_noadd/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/difffile_fixtures/osctest/remote_simple_noadd/toadd2 b/tests/difffile_fixtures/osctest/remote_simple_noadd/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/difffile_fixtures/osctest/remote_simple_noadd/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/difffile_fixtures/osctest/replaced/.osc/_apiurl b/tests/difffile_fixtures/osctest/replaced/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/difffile_fixtures/osctest/replaced/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/difffile_fixtures/osctest/replaced/.osc/_files b/tests/difffile_fixtures/osctest/replaced/.osc/_files deleted file mode 100644 index c275f82..0000000 --- a/tests/difffile_fixtures/osctest/replaced/.osc/_files +++ /dev/null @@ -1,3 +0,0 @@ -<directory name="replaced" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="81be947db54c2e225dc8eacce64d8a4a" mtime="1282731457" name="replaced" size="17" /> -</directory> diff --git a/tests/difffile_fixtures/osctest/replaced/.osc/_osclib_version b/tests/difffile_fixtures/osctest/replaced/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/difffile_fixtures/osctest/replaced/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/difffile_fixtures/osctest/replaced/.osc/_package b/tests/difffile_fixtures/osctest/replaced/.osc/_package deleted file mode 100644 index feae347..0000000 --- a/tests/difffile_fixtures/osctest/replaced/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -replaced diff --git a/tests/difffile_fixtures/osctest/replaced/.osc/_project b/tests/difffile_fixtures/osctest/replaced/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/difffile_fixtures/osctest/replaced/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/difffile_fixtures/osctest/replaced/.osc/_to_be_added b/tests/difffile_fixtures/osctest/replaced/.osc/_to_be_added deleted file mode 100644 index feae347..0000000 --- a/tests/difffile_fixtures/osctest/replaced/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -replaced diff --git a/tests/difffile_fixtures/osctest/replaced/.osc/replaced b/tests/difffile_fixtures/osctest/replaced/.osc/replaced deleted file mode 100644 index 7c3f1a8..0000000 --- a/tests/difffile_fixtures/osctest/replaced/.osc/replaced +++ /dev/null @@ -1 +0,0 @@ -yet another file diff --git a/tests/difffile_fixtures/osctest/replaced/replaced b/tests/difffile_fixtures/osctest/replaced/replaced deleted file mode 100644 index f479fb8..0000000 --- a/tests/difffile_fixtures/osctest/replaced/replaced +++ /dev/null @@ -1 +0,0 @@ -foo replaced diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_apiurl b/tests/difffile_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_files b/tests/difffile_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index 041f606..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,9 +0,0 @@ -<directory name="simple" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" 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="eb9c2bf0eb63f3a7bc0ea37ef18aeba5" mtime="1282730880" name="somefile" size="13" /> - <entry md5="81be947db54c2e225dc8eacce64d8a4a" mtime="1282731457" name="replaced" size="17" /> - <entry md5="676513fde5797c3785164942c97dfec1" mtime="1282731738" name="missing" size="8" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="12" skipped="true" /> -</directory> diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_in_conflict b/tests/difffile_fixtures/osctest/simple/.osc/_in_conflict deleted file mode 100644 index 257cc56..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_osclib_version b/tests/difffile_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_package b/tests/difffile_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_project b/tests/difffile_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_to_be_added b/tests/difffile_fixtures/osctest/simple/.osc/_to_be_added deleted file mode 100644 index 1f4923c..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/_to_be_added +++ /dev/null @@ -1,3 +0,0 @@ -toadd1 -replaced -addedmissing diff --git a/tests/difffile_fixtures/osctest/simple/.osc/_to_be_deleted b/tests/difffile_fixtures/osctest/simple/.osc/_to_be_deleted deleted file mode 100644 index ebf038b..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -somefile diff --git a/tests/difffile_fixtures/osctest/simple/.osc/foo b/tests/difffile_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/difffile_fixtures/osctest/simple/.osc/merge b/tests/difffile_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/simple/.osc/missing b/tests/difffile_fixtures/osctest/simple/.osc/missing deleted file mode 100644 index 33e45d5..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/missing +++ /dev/null @@ -1 +0,0 @@ -missing diff --git a/tests/difffile_fixtures/osctest/simple/.osc/nochange b/tests/difffile_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/difffile_fixtures/osctest/simple/.osc/replaced b/tests/difffile_fixtures/osctest/simple/.osc/replaced deleted file mode 100644 index 7c3f1a8..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/replaced +++ /dev/null @@ -1 +0,0 @@ -yet another file diff --git a/tests/difffile_fixtures/osctest/simple/.osc/somefile b/tests/difffile_fixtures/osctest/simple/.osc/somefile deleted file mode 100644 index 2ef267e..0000000 --- a/tests/difffile_fixtures/osctest/simple/.osc/somefile +++ /dev/null @@ -1 +0,0 @@ -some content diff --git a/tests/difffile_fixtures/osctest/simple/foo b/tests/difffile_fixtures/osctest/simple/foo deleted file mode 100644 index ad9621d..0000000 --- a/tests/difffile_fixtures/osctest/simple/foo +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< foo.mine -This is no test. -======= -This is a simple test. ->>>>>>> foo.r2 diff --git a/tests/difffile_fixtures/osctest/simple/merge b/tests/difffile_fixtures/osctest/simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/difffile_fixtures/osctest/simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/difffile_fixtures/osctest/simple/nochange b/tests/difffile_fixtures/osctest/simple/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/difffile_fixtures/osctest/simple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/difffile_fixtures/osctest/simple/replaced b/tests/difffile_fixtures/osctest/simple/replaced deleted file mode 100644 index f479fb8..0000000 --- a/tests/difffile_fixtures/osctest/simple/replaced +++ /dev/null @@ -1 +0,0 @@ -foo replaced diff --git a/tests/difffile_fixtures/osctest/simple/toadd1 b/tests/difffile_fixtures/osctest/simple/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/difffile_fixtures/osctest/simple/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/difffile_fixtures/osctest/simple/toadd2 b/tests/difffile_fixtures/osctest/simple/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/difffile_fixtures/osctest/simple/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/difffile_fixtures/testDiffRemoteDeletedLocalAdded_files b/tests/difffile_fixtures/testDiffRemoteDeletedLocalAdded_files deleted file mode 100644 index 4aec6af..0000000 --- a/tests/difffile_fixtures/testDiffRemoteDeletedLocalAdded_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3"> - <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/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_binary b/tests/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_binary Binary files differdeleted file mode 100644 index 188a937..0000000 --- a/tests/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_binary +++ /dev/null diff --git a/tests/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_files b/tests/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_files deleted file mode 100644 index 5ac058d..0000000 --- a/tests/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_files +++ /dev/null @@ -1,7 +0,0 @@ -<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3"> - <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="136a96e1470ec7424bc8ae47612977db" mtime="1282914026" name="foobar" size="14" /> - <entry md5="9b55c93ffec5ef8850c84882de7ef6b5" mtime="1283242538" name="binary" size="7" /> -</directory> diff --git a/tests/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_foobar b/tests/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_foobar deleted file mode 100644 index e7856a6..0000000 --- a/tests/difffile_fixtures/testDiffRemoteExistingLocalNotExisting_foobar +++ /dev/null @@ -1,2 +0,0 @@ -foobar -barfoo diff --git a/tests/difffile_fixtures/testDiffRemoteMissingLocalDeleted_files b/tests/difffile_fixtures/testDiffRemoteMissingLocalDeleted_files deleted file mode 100644 index 3ceb10c..0000000 --- a/tests/difffile_fixtures/testDiffRemoteMissingLocalDeleted_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> -</directory> diff --git a/tests/difffile_fixtures/testDiffRemoteMissingLocalExisting_files b/tests/difffile_fixtures/testDiffRemoteMissingLocalExisting_files deleted file mode 100644 index 204fdda..0000000 --- a/tests/difffile_fixtures/testDiffRemoteMissingLocalExisting_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3"> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> -</directory> diff --git a/tests/difffile_fixtures/testDiffRemoteModified_files b/tests/difffile_fixtures/testDiffRemoteModified_files deleted file mode 100644 index d0983af..0000000 --- a/tests/difffile_fixtures/testDiffRemoteModified_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" /> - <entry md5="daafe513479072c5a942928d1850a939" mtime="1282908295" name="merge" size="35" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> -</directory> diff --git a/tests/difffile_fixtures/testDiffRemoteModified_merge b/tests/difffile_fixtures/testDiffRemoteModified_merge deleted file mode 100644 index 6236bd0..0000000 --- a/tests/difffile_fixtures/testDiffRemoteModified_merge +++ /dev/null @@ -1,3 +0,0 @@ -Is it -possible to -merge this file? diff --git a/tests/difffile_fixtures/testDiffRemoteNoChange_files b/tests/difffile_fixtures/testDiffRemoteNoChange_files deleted file mode 100644 index 4aec6af..0000000 --- a/tests/difffile_fixtures/testDiffRemoteNoChange_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3"> - <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/difffile_fixtures/testDiffRemoteUnchangedLocalModified_binary b/tests/difffile_fixtures/testDiffRemoteUnchangedLocalModified_binary Binary files differdeleted file mode 100644 index 5868978..0000000 --- a/tests/difffile_fixtures/testDiffRemoteUnchangedLocalModified_binary +++ /dev/null diff --git a/tests/difffile_fixtures/testDiffRemoteUnchangedLocalModified_files b/tests/difffile_fixtures/testDiffRemoteUnchangedLocalModified_files deleted file mode 100644 index 054024f..0000000 --- a/tests/difffile_fixtures/testDiffRemoteUnchangedLocalModified_files +++ /dev/null @@ -1,6 +0,0 @@ -<directory name="simple" rev="3" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="3"> - <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="b1b642cdbacf9956104f8565e297ed00" mtime="1283246089" name="binary" size="27" /> -</directory> diff --git a/tests/difffile_fixtures/testDiffRemoteUnchangedLocalModified_nochange b/tests/difffile_fixtures/testDiffRemoteUnchangedLocalModified_nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/difffile_fixtures/testDiffRemoteUnchangedLocalModified_nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/init_package_fixtures/oscrc b/tests/init_package_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/init_package_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/init_project_fixtures/oscrc b/tests/init_project_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/init_project_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/osc b/tests/osc deleted file mode 120000 index b2faf3e..0000000 --- a/tests/osc +++ /dev/null @@ -1 +0,0 @@ -../osc
\ No newline at end of file diff --git a/tests/prdiff_fixtures/common-two-diff b/tests/prdiff_fixtures/common-two-diff deleted file mode 100644 index a06ddea..0000000 --- a/tests/prdiff_fixtures/common-two-diff +++ /dev/null @@ -1,10 +0,0 @@ -Index: common-two -=================================================================== ---- common-two 2013-01-18 19:18:38.225983117 +0000 -+++ common-two 2013-01-18 19:19:27.882082325 +0000 -@@ -1,4 +1,5 @@ - line one - line two - line three -+an extra line - last line diff --git a/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_apiurl b/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_packages b/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_packages deleted file mode 100644 index e1711ef..0000000 --- a/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_packages +++ /dev/null @@ -1,4 +0,0 @@ -<project name="home:user:branches:some:project"> - <package name="common-one" state=" " /> - <package name="common-two" state=" " /> -</project>
\ No newline at end of file diff --git a/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_project b/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_project deleted file mode 100644 index b83a395..0000000 --- a/tests/prdiff_fixtures/home:user:branches:some:project/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -home:user:branches:some:project diff --git a/tests/prdiff_fixtures/home:user:branches:some:project/common-two b/tests/prdiff_fixtures/home:user:branches:some:project/common-two deleted file mode 100644 index ade1e2d..0000000 --- a/tests/prdiff_fixtures/home:user:branches:some:project/common-two +++ /dev/null @@ -1,5 +0,0 @@ -line one -line two -line three -an extra line -last line
\ No newline at end of file diff --git a/tests/prdiff_fixtures/home:user:branches:some:project/directory b/tests/prdiff_fixtures/home:user:branches:some:project/directory deleted file mode 100644 index f29d454..0000000 --- a/tests/prdiff_fixtures/home:user:branches:some:project/directory +++ /dev/null @@ -1,6 +0,0 @@ -<directory count='4'> - <entry name="common-one"/> - <entry name="common-two"/> - <entry name="common-three"/> - <entry name="only-in-new"/> -</directory> diff --git a/tests/prdiff_fixtures/new:prj/common-two b/tests/prdiff_fixtures/new:prj/common-two deleted file mode 100644 index ade1e2d..0000000 --- a/tests/prdiff_fixtures/new:prj/common-two +++ /dev/null @@ -1,5 +0,0 @@ -line one -line two -line three -an extra line -last line
\ No newline at end of file diff --git a/tests/prdiff_fixtures/new:prj/directory b/tests/prdiff_fixtures/new:prj/directory deleted file mode 100644 index f29d454..0000000 --- a/tests/prdiff_fixtures/new:prj/directory +++ /dev/null @@ -1,6 +0,0 @@ -<directory count='4'> - <entry name="common-one"/> - <entry name="common-two"/> - <entry name="common-three"/> - <entry name="only-in-new"/> -</directory> diff --git a/tests/prdiff_fixtures/no-requests b/tests/prdiff_fixtures/no-requests deleted file mode 100644 index aef429f..0000000 --- a/tests/prdiff_fixtures/no-requests +++ /dev/null @@ -1,2 +0,0 @@ -<collection matches="0"> -</collection> diff --git a/tests/prdiff_fixtures/old:prj/common-two b/tests/prdiff_fixtures/old:prj/common-two deleted file mode 100644 index 48365a3..0000000 --- a/tests/prdiff_fixtures/old:prj/common-two +++ /dev/null @@ -1,4 +0,0 @@ -line one -line two -line three -last line
\ No newline at end of file diff --git a/tests/prdiff_fixtures/old:prj/directory b/tests/prdiff_fixtures/old:prj/directory deleted file mode 100644 index a9db4b7..0000000 --- a/tests/prdiff_fixtures/old:prj/directory +++ /dev/null @@ -1,6 +0,0 @@ -<directory count='4'> - <entry name="common-one"/> - <entry name="common-two"/> - <entry name="common-three"/> - <entry name="only-in-old"/> -</directory> diff --git a/tests/prdiff_fixtures/oscrc b/tests/prdiff_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/prdiff_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/prdiff_fixtures/osctest/.osc/_apiurl b/tests/prdiff_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/prdiff_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/prdiff_fixtures/osctest/.osc/_packages b/tests/prdiff_fixtures/osctest/.osc/_packages deleted file mode 100644 index e1711ef..0000000 --- a/tests/prdiff_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1,4 +0,0 @@ -<project name="home:user:branches:some:project"> - <package name="common-one" state=" " /> - <package name="common-two" state=" " /> -</project>
\ No newline at end of file diff --git a/tests/prdiff_fixtures/osctest/.osc/_project b/tests/prdiff_fixtures/osctest/.osc/_project deleted file mode 100644 index b83a395..0000000 --- a/tests/prdiff_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -home:user:branches:some:project diff --git a/tests/prdiff_fixtures/osctest/common-one/.osc/_apiurl b/tests/prdiff_fixtures/osctest/common-one/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/prdiff_fixtures/osctest/common-one/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/prdiff_fixtures/osctest/common-one/.osc/_files b/tests/prdiff_fixtures/osctest/common-one/.osc/_files deleted file mode 100644 index 4b6dcca..0000000 --- a/tests/prdiff_fixtures/osctest/common-one/.osc/_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="common-one" rev="f53d033d63c3d6e9a8e4493225976122" srcmd5="f53d033d63c3d6e9a8e4493225976122"> - <linkinfo baserev="896e6d6d675d03b6934946d03a976450" lsrcmd5="0cf460222270b58e2a9a3d695b1d945d" package="common-one" project="some:project" srcmd5="8c7ed3cf5ec0b4aa20ef159fd8c51b76" /> - <entry md5="1a4c23ccf2eb12403acbfa3258233a9d" mtime="1352816081" name="common-one.spec" size="3457" /> -</directory> diff --git a/tests/prdiff_fixtures/osctest/common-one/.osc/_meta b/tests/prdiff_fixtures/osctest/common-one/.osc/_meta deleted file mode 100644 index 3804519..0000000 --- a/tests/prdiff_fixtures/osctest/common-one/.osc/_meta +++ /dev/null @@ -1,10 +0,0 @@ -<package name="common-one" project="home:user:branches:some:project"> - <title>blah</title> - <description>foo</description> - <debuginfo> - <enable repository="openSUSE_12.2"/> - <enable repository="openSUSE_Factory"/> - <enable repository="SLE_11_SP2"/> - </debuginfo> -</package> - diff --git a/tests/prdiff_fixtures/osctest/common-one/.osc/_osclib_version b/tests/prdiff_fixtures/osctest/common-one/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/prdiff_fixtures/osctest/common-one/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/prdiff_fixtures/osctest/common-one/.osc/_package b/tests/prdiff_fixtures/osctest/common-one/.osc/_package deleted file mode 100644 index 089880f..0000000 --- a/tests/prdiff_fixtures/osctest/common-one/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -common-one
\ No newline at end of file diff --git a/tests/prdiff_fixtures/osctest/common-one/.osc/_project b/tests/prdiff_fixtures/osctest/common-one/.osc/_project deleted file mode 100644 index b83a395..0000000 --- a/tests/prdiff_fixtures/osctest/common-one/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -home:user:branches:some:project diff --git a/tests/prdiff_fixtures/osctest/common-one/.osc/common-one.spec b/tests/prdiff_fixtures/osctest/common-one/.osc/common-one.spec deleted file mode 100644 index 99bed78..0000000 --- a/tests/prdiff_fixtures/osctest/common-one/.osc/common-one.spec +++ /dev/null @@ -1 +0,0 @@ -contents are irrelevant diff --git a/tests/prdiff_fixtures/osctest/common-one/common-one.spec b/tests/prdiff_fixtures/osctest/common-one/common-one.spec deleted file mode 100644 index 99bed78..0000000 --- a/tests/prdiff_fixtures/osctest/common-one/common-one.spec +++ /dev/null @@ -1 +0,0 @@ -contents are irrelevant diff --git a/tests/prdiff_fixtures/osctest/common-two/.osc/_apiurl b/tests/prdiff_fixtures/osctest/common-two/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/prdiff_fixtures/osctest/common-two/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/prdiff_fixtures/osctest/common-two/.osc/_files b/tests/prdiff_fixtures/osctest/common-two/.osc/_files deleted file mode 100644 index 63b65f2..0000000 --- a/tests/prdiff_fixtures/osctest/common-two/.osc/_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="common-two" rev="f53d033d63c3d6e9a8e4493225976122" srcmd5="f53d033d63c3d6e9a8e4493225976122"> - <linkinfo baserev="896e6d6d675d03b6934946d03a976450" lsrcmd5="0cf460222270b58e2a9a3d695b1d945d" package="common-two" project="some:project" srcmd5="8c7ed3cf5ec0b4aa20ef159fd8c51b76" /> - <entry md5="1a4c23ccf2eb12403acbfa3258233a9d" mtime="1352816081" name="common-two.spec" size="3457" /> -</directory> diff --git a/tests/prdiff_fixtures/osctest/common-two/.osc/_meta b/tests/prdiff_fixtures/osctest/common-two/.osc/_meta deleted file mode 100644 index 3d41ffd..0000000 --- a/tests/prdiff_fixtures/osctest/common-two/.osc/_meta +++ /dev/null @@ -1,10 +0,0 @@ -<package name="common-two" project="home:user:branches:some:project"> - <title>blah</title> - <description>foo</description> - <debuginfo> - <enable repository="openSUSE_12.2"/> - <enable repository="openSUSE_Factory"/> - <enable repository="SLE_11_SP2"/> - </debuginfo> -</package> - diff --git a/tests/prdiff_fixtures/osctest/common-two/.osc/_osclib_version b/tests/prdiff_fixtures/osctest/common-two/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/prdiff_fixtures/osctest/common-two/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/prdiff_fixtures/osctest/common-two/.osc/_package b/tests/prdiff_fixtures/osctest/common-two/.osc/_package deleted file mode 100644 index 2ff3828..0000000 --- a/tests/prdiff_fixtures/osctest/common-two/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -common-two
\ No newline at end of file diff --git a/tests/prdiff_fixtures/osctest/common-two/.osc/_project b/tests/prdiff_fixtures/osctest/common-two/.osc/_project deleted file mode 100644 index b83a395..0000000 --- a/tests/prdiff_fixtures/osctest/common-two/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -home:user:branches:some:project diff --git a/tests/prdiff_fixtures/osctest/common-two/.osc/common-two.spec b/tests/prdiff_fixtures/osctest/common-two/.osc/common-two.spec deleted file mode 100644 index 99bed78..0000000 --- a/tests/prdiff_fixtures/osctest/common-two/.osc/common-two.spec +++ /dev/null @@ -1 +0,0 @@ -contents are irrelevant diff --git a/tests/prdiff_fixtures/osctest/common-two/common-two.spec b/tests/prdiff_fixtures/osctest/common-two/common-two.spec deleted file mode 100644 index 99bed78..0000000 --- a/tests/prdiff_fixtures/osctest/common-two/common-two.spec +++ /dev/null @@ -1 +0,0 @@ -contents are irrelevant diff --git a/tests/prdiff_fixtures/request b/tests/prdiff_fixtures/request deleted file mode 100644 index 2355cbb..0000000 --- a/tests/prdiff_fixtures/request +++ /dev/null @@ -1,16 +0,0 @@ -<collection matches="1"> - <request id="148023"> - <action type="submit"> - <source project="home:user:branches:some:project" package="common-two" rev="7"/> - <target project="some:project" package="common-two"/> - <options> - <sourceupdate>update</sourceupdate> - </options> - </action> - <state name="new" who="user" when="2013-01-11T11:04:14"> - <comment/> - </state> - <description>- Fix it to work -- Improve support for something</description> - </request> -</collection> diff --git a/tests/prdiff_fixtures/some:project/.osc/_apiurl b/tests/prdiff_fixtures/some:project/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/prdiff_fixtures/some:project/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/prdiff_fixtures/some:project/.osc/_packages b/tests/prdiff_fixtures/some:project/.osc/_packages deleted file mode 100644 index c4c8b11..0000000 --- a/tests/prdiff_fixtures/some:project/.osc/_packages +++ /dev/null @@ -1,4 +0,0 @@ -<project name="some:project"> - <package name="common-one" state=" " /> - <package name="common-two" state=" " /> -</project>
\ No newline at end of file diff --git a/tests/prdiff_fixtures/some:project/.osc/_project b/tests/prdiff_fixtures/some:project/.osc/_project deleted file mode 100644 index f9a316e..0000000 --- a/tests/prdiff_fixtures/some:project/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -some:project diff --git a/tests/prdiff_fixtures/some:project/common-two b/tests/prdiff_fixtures/some:project/common-two deleted file mode 100644 index ade1e2d..0000000 --- a/tests/prdiff_fixtures/some:project/common-two +++ /dev/null @@ -1,5 +0,0 @@ -line one -line two -line three -an extra line -last line
\ No newline at end of file diff --git a/tests/prdiff_fixtures/some:project/directory b/tests/prdiff_fixtures/some:project/directory deleted file mode 100644 index f29d454..0000000 --- a/tests/prdiff_fixtures/some:project/directory +++ /dev/null @@ -1,6 +0,0 @@ -<directory count='4'> - <entry name="common-one"/> - <entry name="common-two"/> - <entry name="common-three"/> - <entry name="only-in-new"/> -</directory> diff --git a/tests/project_package_status_fixtures/oscrc b/tests/project_package_status_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/project_package_status_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/project_package_status_fixtures/osctest/.osc/_apiurl b/tests/project_package_status_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/project_package_status_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/project_package_status_fixtures/osctest/.osc/_packages b/tests/project_package_status_fixtures/osctest/.osc/_packages deleted file mode 100644 index 2b174fd..0000000 --- a/tests/project_package_status_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1,9 +0,0 @@ -<project name="osctest"> - <package name="conflict" state=" " /> - <package name="simple" state=" " /> - <package name="added" state="A" /> - <package name="deleted" state="D" /> - <package name="missing" state="!" /> - <package name="added_deleted" state="A" /> - <package name="deleted_deleted" state="D" /> -</project> diff --git a/tests/project_package_status_fixtures/osctest/.osc/_project b/tests/project_package_status_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/project_package_status_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/project_package_status_fixtures/osctest/added/.osc/_apiurl b/tests/project_package_status_fixtures/osctest/added/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/project_package_status_fixtures/osctest/added/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/project_package_status_fixtures/osctest/added/.osc/_files b/tests/project_package_status_fixtures/osctest/added/.osc/_files deleted file mode 100644 index 9814121..0000000 --- a/tests/project_package_status_fixtures/osctest/added/.osc/_files +++ /dev/null @@ -1 +0,0 @@ -<directory /> diff --git a/tests/project_package_status_fixtures/osctest/added/.osc/_osclib_version b/tests/project_package_status_fixtures/osctest/added/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/project_package_status_fixtures/osctest/added/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/project_package_status_fixtures/osctest/added/.osc/_package b/tests/project_package_status_fixtures/osctest/added/.osc/_package deleted file mode 100644 index d5f7fc3..0000000 --- a/tests/project_package_status_fixtures/osctest/added/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -added diff --git a/tests/project_package_status_fixtures/osctest/added/.osc/_project b/tests/project_package_status_fixtures/osctest/added/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/project_package_status_fixtures/osctest/added/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/project_package_status_fixtures/osctest/added/.osc/_to_be_added b/tests/project_package_status_fixtures/osctest/added/.osc/_to_be_added deleted file mode 100644 index 3e75765..0000000 --- a/tests/project_package_status_fixtures/osctest/added/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -new diff --git a/tests/project_package_status_fixtures/osctest/added/exists b/tests/project_package_status_fixtures/osctest/added/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/project_package_status_fixtures/osctest/added/exists +++ /dev/null diff --git a/tests/project_package_status_fixtures/osctest/added/new b/tests/project_package_status_fixtures/osctest/added/new deleted file mode 100644 index 3e75765..0000000 --- a/tests/project_package_status_fixtures/osctest/added/new +++ /dev/null @@ -1 +0,0 @@ -new diff --git a/tests/project_package_status_fixtures/osctest/conflict/.osc/_apiurl b/tests/project_package_status_fixtures/osctest/conflict/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/project_package_status_fixtures/osctest/conflict/.osc/_files b/tests/project_package_status_fixtures/osctest/conflict/.osc/_files deleted file mode 100644 index 141eaef..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/.osc/_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="1282047303" name="conflict" size="22" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/project_package_status_fixtures/osctest/conflict/.osc/_in_conflict b/tests/project_package_status_fixtures/osctest/conflict/.osc/_in_conflict deleted file mode 100644 index 9b1719f..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -conflict diff --git a/tests/project_package_status_fixtures/osctest/conflict/.osc/_osclib_version b/tests/project_package_status_fixtures/osctest/conflict/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/project_package_status_fixtures/osctest/conflict/.osc/_package b/tests/project_package_status_fixtures/osctest/conflict/.osc/_package deleted file mode 100644 index 9b1719f..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -conflict diff --git a/tests/project_package_status_fixtures/osctest/conflict/.osc/_project b/tests/project_package_status_fixtures/osctest/conflict/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/project_package_status_fixtures/osctest/conflict/.osc/conflict b/tests/project_package_status_fixtures/osctest/conflict/.osc/conflict deleted file mode 100644 index 34d6872..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/.osc/conflict +++ /dev/null @@ -1 +0,0 @@ -This file did change. diff --git a/tests/project_package_status_fixtures/osctest/conflict/.osc/test b/tests/project_package_status_fixtures/osctest/conflict/.osc/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/.osc/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/project_package_status_fixtures/osctest/conflict/conflict b/tests/project_package_status_fixtures/osctest/conflict/conflict deleted file mode 100644 index e47c5a6..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/conflict +++ /dev/null @@ -1 +0,0 @@ -Inconflict diff --git a/tests/project_package_status_fixtures/osctest/conflict/exists b/tests/project_package_status_fixtures/osctest/conflict/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/exists +++ /dev/null diff --git a/tests/project_package_status_fixtures/osctest/conflict/test b/tests/project_package_status_fixtures/osctest/conflict/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/project_package_status_fixtures/osctest/conflict/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/project_package_status_fixtures/osctest/deleted/.osc/_apiurl b/tests/project_package_status_fixtures/osctest/deleted/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/project_package_status_fixtures/osctest/deleted/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/project_package_status_fixtures/osctest/deleted/.osc/_files b/tests/project_package_status_fixtures/osctest/deleted/.osc/_files deleted file mode 100644 index af92bf7..0000000 --- a/tests/project_package_status_fixtures/osctest/deleted/.osc/_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="1282047303" name="modified" size="22" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/project_package_status_fixtures/osctest/deleted/.osc/_osclib_version b/tests/project_package_status_fixtures/osctest/deleted/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/project_package_status_fixtures/osctest/deleted/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/project_package_status_fixtures/osctest/deleted/.osc/_package b/tests/project_package_status_fixtures/osctest/deleted/.osc/_package deleted file mode 100644 index 71779d2..0000000 --- a/tests/project_package_status_fixtures/osctest/deleted/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -deleted diff --git a/tests/project_package_status_fixtures/osctest/deleted/.osc/_project b/tests/project_package_status_fixtures/osctest/deleted/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/project_package_status_fixtures/osctest/deleted/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/project_package_status_fixtures/osctest/deleted/.osc/_to_be_deleted b/tests/project_package_status_fixtures/osctest/deleted/.osc/_to_be_deleted deleted file mode 100644 index 25fff4f..0000000 --- a/tests/project_package_status_fixtures/osctest/deleted/.osc/_to_be_deleted +++ /dev/null @@ -1,2 +0,0 @@ -modified -test diff --git a/tests/project_package_status_fixtures/osctest/deleted/.osc/modified b/tests/project_package_status_fixtures/osctest/deleted/.osc/modified deleted file mode 100644 index 34d6872..0000000 --- a/tests/project_package_status_fixtures/osctest/deleted/.osc/modified +++ /dev/null @@ -1 +0,0 @@ -This file did change. diff --git a/tests/project_package_status_fixtures/osctest/deleted/.osc/test b/tests/project_package_status_fixtures/osctest/deleted/.osc/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/project_package_status_fixtures/osctest/deleted/.osc/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/project_package_status_fixtures/osctest/excluded/.osc/_apiurl b/tests/project_package_status_fixtures/osctest/excluded/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/project_package_status_fixtures/osctest/excluded/.osc/_files b/tests/project_package_status_fixtures/osctest/excluded/.osc/_files deleted file mode 100644 index af92bf7..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/.osc/_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="2abd19de6a38ff2890af64f453df96b1" mtime="1282047303" name="modified" size="22" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/project_package_status_fixtures/osctest/excluded/.osc/_osclib_version b/tests/project_package_status_fixtures/osctest/excluded/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/project_package_status_fixtures/osctest/excluded/.osc/_package b/tests/project_package_status_fixtures/osctest/excluded/.osc/_package deleted file mode 100644 index bbde3dc..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -excluded diff --git a/tests/project_package_status_fixtures/osctest/excluded/.osc/_project b/tests/project_package_status_fixtures/osctest/excluded/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/project_package_status_fixtures/osctest/excluded/.osc/modified b/tests/project_package_status_fixtures/osctest/excluded/.osc/modified deleted file mode 100644 index 34d6872..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/.osc/modified +++ /dev/null @@ -1 +0,0 @@ -This file did change. diff --git a/tests/project_package_status_fixtures/osctest/excluded/.osc/test b/tests/project_package_status_fixtures/osctest/excluded/.osc/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/.osc/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/project_package_status_fixtures/osctest/excluded/_linkerror b/tests/project_package_status_fixtures/osctest/excluded/_linkerror deleted file mode 100644 index e69de29..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/_linkerror +++ /dev/null diff --git a/tests/project_package_status_fixtures/osctest/excluded/dir/file b/tests/project_package_status_fixtures/osctest/excluded/dir/file deleted file mode 100644 index f73f309..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/dir/file +++ /dev/null @@ -1 +0,0 @@ -file diff --git a/tests/project_package_status_fixtures/osctest/excluded/exists b/tests/project_package_status_fixtures/osctest/excluded/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/exists +++ /dev/null diff --git a/tests/project_package_status_fixtures/osctest/excluded/foo.orig b/tests/project_package_status_fixtures/osctest/excluded/foo.orig deleted file mode 100644 index e69de29..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/foo.orig +++ /dev/null diff --git a/tests/project_package_status_fixtures/osctest/excluded/modified b/tests/project_package_status_fixtures/osctest/excluded/modified deleted file mode 100644 index 2e09960..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/modified +++ /dev/null @@ -1 +0,0 @@ -modified diff --git a/tests/project_package_status_fixtures/osctest/excluded/test b/tests/project_package_status_fixtures/osctest/excluded/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/project_package_status_fixtures/osctest/excluded/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/_apiurl b/tests/project_package_status_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/_files b/tests/project_package_status_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index 01e60f4..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,8 +0,0 @@ -<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="676513fde5797c3785164942c97dfec1" mtime="1283506309" name="missing" size="8" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" skipped="true" /> -</directory> diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/_osclib_version b/tests/project_package_status_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/_package b/tests/project_package_status_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index ab23474..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/_project b/tests/project_package_status_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/_to_be_added b/tests/project_package_status_fixtures/osctest/simple/.osc/_to_be_added deleted file mode 100644 index f499143..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/_to_be_added +++ /dev/null @@ -1,3 +0,0 @@ -add -missing -missing_added diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/_to_be_deleted b/tests/project_package_status_fixtures/osctest/simple/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/foo b/tests/project_package_status_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/merge b/tests/project_package_status_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/missing b/tests/project_package_status_fixtures/osctest/simple/.osc/missing deleted file mode 100644 index 33e45d5..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/missing +++ /dev/null @@ -1 +0,0 @@ -missing diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/nochange b/tests/project_package_status_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/project_package_status_fixtures/osctest/simple/.osc/test b/tests/project_package_status_fixtures/osctest/simple/.osc/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/.osc/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/project_package_status_fixtures/osctest/simple/add b/tests/project_package_status_fixtures/osctest/simple/add deleted file mode 100644 index b242c36..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/add +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tests/project_package_status_fixtures/osctest/simple/exists b/tests/project_package_status_fixtures/osctest/simple/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/exists +++ /dev/null diff --git a/tests/project_package_status_fixtures/osctest/simple/missing b/tests/project_package_status_fixtures/osctest/simple/missing deleted file mode 100644 index feae347..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/missing +++ /dev/null @@ -1 +0,0 @@ -replaced diff --git a/tests/project_package_status_fixtures/osctest/simple/nochange b/tests/project_package_status_fixtures/osctest/simple/nochange deleted file mode 100644 index 34d6872..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/nochange +++ /dev/null @@ -1 +0,0 @@ -This file did change. diff --git a/tests/project_package_status_fixtures/osctest/simple/test b/tests/project_package_status_fixtures/osctest/simple/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/project_package_status_fixtures/osctest/simple/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/repairwc_fixtures/oscrc b/tests/repairwc_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/repairwc_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/repairwc_fixtures/osctest/.osc/_apiurl b/tests/repairwc_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/.osc/_packages b/tests/repairwc_fixtures/osctest/.osc/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/repairwc_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/repairwc_fixtures/osctest/.osc/_project b/tests/repairwc_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/repairwc_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/repairwc_fixtures/osctest/_packages b/tests/repairwc_fixtures/osctest/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/repairwc_fixtures/osctest/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_apiurl b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_buildconfig_prj_arch b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_buildconfig_prj_arch deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_buildconfig_prj_arch +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_buildinfo_prj_arch.xml b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_buildinfo_prj_arch.xml deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_buildinfo_prj_arch.xml +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_files b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_files deleted file mode 100644 index d8e2ba4..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="buildfiles" 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/repairwc_fixtures/osctest/buildfiles/.osc/_in_conflict b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_in_conflict deleted file mode 100644 index 55aa746..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -nochange diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_package b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_package deleted file mode 100644 index 8c26334..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -buildfiles diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_project b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_to_be_added b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_to_be_added deleted file mode 100644 index 323fae0..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/buildfiles/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/foo b/tests/repairwc_fixtures/osctest/buildfiles/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/merge b/tests/repairwc_fixtures/osctest/buildfiles/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/buildfiles/.osc/nochange b/tests/repairwc_fixtures/osctest/buildfiles/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/buildfiles/foobar b/tests/repairwc_fixtures/osctest/buildfiles/foobar deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/foobar +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/buildfiles/merge b/tests/repairwc_fixtures/osctest/buildfiles/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/buildfiles/nochange b/tests/repairwc_fixtures/osctest/buildfiles/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/buildfiles/toadd1 b/tests/repairwc_fixtures/osctest/buildfiles/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/buildfiles/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_apiurl b/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_apiurl deleted file mode 100644 index 718a28b..0000000 --- a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -urlwithoutprotocolandtld diff --git a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_files b/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_files deleted file mode 100644 index 15245ce..0000000 --- a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_files +++ /dev/null @@ -1 +0,0 @@ -<directory name="invalid_apiurl" rev="1" vrev="1" srcmd5="2738234914de5cc154b1494b1e98d940" /> diff --git a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_meta b/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_meta deleted file mode 100644 index 13c5146..0000000 --- a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_meta +++ /dev/null @@ -1,11 +0,0 @@ -<package project="remote" name="foo"> - <title>Title of New Package</title> - <description> -LONG DESCRIPTION -GOES -HERE - </description> - <person userid="Admin" role="maintainer"/> - <person userid="Admin" role="bugowner"/> - <url>PUT_UPSTREAM_URL_HERE</url> -</package> diff --git a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_package b/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_package deleted file mode 100644 index 2c2226b..0000000 --- a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -invalid_apiurl diff --git a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_project b/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_project deleted file mode 100644 index 9c998f7..0000000 --- a/tests/repairwc_fixtures/osctest/invalid_apiurl/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -remote diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/_apiurl b/tests/repairwc_fixtures/osctest/multiple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/_files b/tests/repairwc_fixtures/osctest/multiple/.osc/_files deleted file mode 100644 index 8a96986..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="multiple" 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/repairwc_fixtures/osctest/multiple/.osc/_in_conflict b/tests/repairwc_fixtures/osctest/multiple/.osc/_in_conflict deleted file mode 100644 index 55aa746..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -nochange diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/multiple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/_package b/tests/repairwc_fixtures/osctest/multiple/.osc/_package deleted file mode 100644 index 5c4139d..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -multiple diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/_project b/tests/repairwc_fixtures/osctest/multiple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/_to_be_added b/tests/repairwc_fixtures/osctest/multiple/.osc/_to_be_added deleted file mode 100644 index 323fae0..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/multiple/.osc/_to_be_deleted deleted file mode 100644 index 300a93b..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/_to_be_deleted +++ /dev/null @@ -1,2 +0,0 @@ -foo -nofilesentry diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/foo b/tests/repairwc_fixtures/osctest/multiple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/multiple/.osc/unknown_file b/tests/repairwc_fixtures/osctest/multiple/.osc/unknown_file deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/.osc/unknown_file +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/multiple/foobar b/tests/repairwc_fixtures/osctest/multiple/foobar deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/foobar +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/multiple/merge b/tests/repairwc_fixtures/osctest/multiple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/multiple/nochange b/tests/repairwc_fixtures/osctest/multiple/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/multiple/toadd1 b/tests/repairwc_fixtures/osctest/multiple/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/multiple/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_files b/tests/repairwc_fixtures/osctest/noapiurl/.osc/_files deleted file mode 100644 index e9158ba..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="noapiurl" 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/repairwc_fixtures/osctest/noapiurl/.osc/_in_conflict b/tests/repairwc_fixtures/osctest/noapiurl/.osc/_in_conflict deleted file mode 100644 index 55aa746..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -nochange diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/noapiurl/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_package b/tests/repairwc_fixtures/osctest/noapiurl/.osc/_package deleted file mode 100644 index 14aa43c..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -noapiurl diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_project b/tests/repairwc_fixtures/osctest/noapiurl/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_to_be_added b/tests/repairwc_fixtures/osctest/noapiurl/.osc/_to_be_added deleted file mode 100644 index 323fae0..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/noapiurl/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/foo b/tests/repairwc_fixtures/osctest/noapiurl/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/merge b/tests/repairwc_fixtures/osctest/noapiurl/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/noapiurl/.osc/nochange b/tests/repairwc_fixtures/osctest/noapiurl/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/noapiurl/foobar b/tests/repairwc_fixtures/osctest/noapiurl/foobar deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/foobar +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/noapiurl/merge b/tests/repairwc_fixtures/osctest/noapiurl/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/noapiurl/nochange b/tests/repairwc_fixtures/osctest/noapiurl/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/noapiurl/toadd1 b/tests/repairwc_fixtures/osctest/noapiurl/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/noapiurl/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple/.osc/_files b/tests/repairwc_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/repairwc_fixtures/osctest/simple/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple/.osc/_package b/tests/repairwc_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple/.osc/_project b/tests/repairwc_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/simple/.osc/foo b/tests/repairwc_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/simple/.osc/merge b/tests/repairwc_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple/.osc/nochange b/tests/repairwc_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple/merge b/tests/repairwc_fixtures/osctest/simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple/nochange b/tests/repairwc_fixtures/osctest/simple/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple/toadd1 b/tests/repairwc_fixtures/osctest/simple/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple/toadd2 b/tests/repairwc_fixtures/osctest/simple/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/repairwc_fixtures/osctest/simple/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/repairwc_fixtures/osctest/simple1/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple1/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple1/.osc/_files b/tests/repairwc_fixtures/osctest/simple1/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/repairwc_fixtures/osctest/simple1/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple1/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple1/.osc/_package b/tests/repairwc_fixtures/osctest/simple1/.osc/_package deleted file mode 100644 index e2464cd..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple1 diff --git a/tests/repairwc_fixtures/osctest/simple1/.osc/_project b/tests/repairwc_fixtures/osctest/simple1/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple1/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple1/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/simple1/.osc/merge b/tests/repairwc_fixtures/osctest/simple1/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple1/.osc/nochange b/tests/repairwc_fixtures/osctest/simple1/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple1/merge b/tests/repairwc_fixtures/osctest/simple1/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple1/nochange b/tests/repairwc_fixtures/osctest/simple1/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple1/toadd1 b/tests/repairwc_fixtures/osctest/simple1/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple1/toadd2 b/tests/repairwc_fixtures/osctest/simple1/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/repairwc_fixtures/osctest/simple1/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple2/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/_files b/tests/repairwc_fixtures/osctest/simple2/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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/repairwc_fixtures/osctest/simple2/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple2/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/_package b/tests/repairwc_fixtures/osctest/simple2/.osc/_package deleted file mode 100644 index e268fff..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple2 diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/_project b/tests/repairwc_fixtures/osctest/simple2/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple2/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/foo b/tests/repairwc_fixtures/osctest/simple2/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/merge b/tests/repairwc_fixtures/osctest/simple2/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/nochange b/tests/repairwc_fixtures/osctest/simple2/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple2/.osc/somefile b/tests/repairwc_fixtures/osctest/simple2/.osc/somefile deleted file mode 100644 index ebf038b..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/.osc/somefile +++ /dev/null @@ -1 +0,0 @@ -somefile diff --git a/tests/repairwc_fixtures/osctest/simple2/merge b/tests/repairwc_fixtures/osctest/simple2/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple2/nochange b/tests/repairwc_fixtures/osctest/simple2/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple2/toadd1 b/tests/repairwc_fixtures/osctest/simple2/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple2/toadd2 b/tests/repairwc_fixtures/osctest/simple2/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/repairwc_fixtures/osctest/simple2/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple3/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/_files b/tests/repairwc_fixtures/osctest/simple3/.osc/_files deleted file mode 100644 index 0479b49..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="simple3" 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/repairwc_fixtures/osctest/simple3/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple3/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/_package b/tests/repairwc_fixtures/osctest/simple3/.osc/_package deleted file mode 100644 index 3d7b9c9..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple3 diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/_project b/tests/repairwc_fixtures/osctest/simple3/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/_to_be_added b/tests/repairwc_fixtures/osctest/simple3/.osc/_to_be_added deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple3/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/foo b/tests/repairwc_fixtures/osctest/simple3/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/merge b/tests/repairwc_fixtures/osctest/simple3/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/nochange b/tests/repairwc_fixtures/osctest/simple3/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple3/.osc/toadd1 b/tests/repairwc_fixtures/osctest/simple3/.osc/toadd1 deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/.osc/toadd1 +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/simple3/merge b/tests/repairwc_fixtures/osctest/simple3/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple3/nochange b/tests/repairwc_fixtures/osctest/simple3/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple3/toadd1 b/tests/repairwc_fixtures/osctest/simple3/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple3/toadd2 b/tests/repairwc_fixtures/osctest/simple3/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/repairwc_fixtures/osctest/simple3/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/repairwc_fixtures/osctest/simple4/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple4/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple4/.osc/_files b/tests/repairwc_fixtures/osctest/simple4/.osc/_files deleted file mode 100644 index 9fa8a9f..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="working_nonempty" 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/repairwc_fixtures/osctest/simple4/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple4/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple4/.osc/_package b/tests/repairwc_fixtures/osctest/simple4/.osc/_package deleted file mode 100644 index 6ece159..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -working_nonempty diff --git a/tests/repairwc_fixtures/osctest/simple4/.osc/_project b/tests/repairwc_fixtures/osctest/simple4/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple4/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple4/.osc/_to_be_deleted deleted file mode 100644 index 6db8a6f..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/_to_be_deleted +++ /dev/null @@ -1,2 +0,0 @@ -foo -remove diff --git a/tests/repairwc_fixtures/osctest/simple4/.osc/foo b/tests/repairwc_fixtures/osctest/simple4/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/simple4/.osc/merge b/tests/repairwc_fixtures/osctest/simple4/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple4/.osc/nochange b/tests/repairwc_fixtures/osctest/simple4/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple4/merge b/tests/repairwc_fixtures/osctest/simple4/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple4/nochange b/tests/repairwc_fixtures/osctest/simple4/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple4/toadd1 b/tests/repairwc_fixtures/osctest/simple4/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple4/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple5/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/_files b/tests/repairwc_fixtures/osctest/simple5/.osc/_files deleted file mode 100644 index 9fa8a9f..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="working_nonempty" 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/repairwc_fixtures/osctest/simple5/.osc/_in_conflict b/tests/repairwc_fixtures/osctest/simple5/.osc/_in_conflict deleted file mode 100644 index 9b1719f..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -conflict diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple5/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/_package b/tests/repairwc_fixtures/osctest/simple5/.osc/_package deleted file mode 100644 index 6ece159..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -working_nonempty diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/_project b/tests/repairwc_fixtures/osctest/simple5/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple5/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/foo b/tests/repairwc_fixtures/osctest/simple5/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/merge b/tests/repairwc_fixtures/osctest/simple5/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple5/.osc/nochange b/tests/repairwc_fixtures/osctest/simple5/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple5/merge b/tests/repairwc_fixtures/osctest/simple5/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple5/nochange b/tests/repairwc_fixtures/osctest/simple5/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple5/toadd1 b/tests/repairwc_fixtures/osctest/simple5/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple5/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple6/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple6/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple6/.osc/_files b/tests/repairwc_fixtures/osctest/simple6/.osc/_files deleted file mode 100644 index 65eb184..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="simple6" 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/repairwc_fixtures/osctest/simple6/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple6/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple6/.osc/_package b/tests/repairwc_fixtures/osctest/simple6/.osc/_package deleted file mode 100644 index 29a2746..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple6 diff --git a/tests/repairwc_fixtures/osctest/simple6/.osc/_project b/tests/repairwc_fixtures/osctest/simple6/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple6/.osc/_to_be_added b/tests/repairwc_fixtures/osctest/simple6/.osc/_to_be_added deleted file mode 100644 index 323fae0..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/repairwc_fixtures/osctest/simple6/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple6/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/simple6/.osc/merge b/tests/repairwc_fixtures/osctest/simple6/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple6/.osc/nochange b/tests/repairwc_fixtures/osctest/simple6/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple6/merge b/tests/repairwc_fixtures/osctest/simple6/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple6/nochange b/tests/repairwc_fixtures/osctest/simple6/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple6/toadd1 b/tests/repairwc_fixtures/osctest/simple6/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple6/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple7/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/_files b/tests/repairwc_fixtures/osctest/simple7/.osc/_files deleted file mode 100644 index 9ae3788..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/_files +++ /dev/null @@ -1,6 +0,0 @@ -<directory name="simple7" 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" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="42" skipped="true" /> -</directory> diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/_in_conflict b/tests/repairwc_fixtures/osctest/simple7/.osc/_in_conflict deleted file mode 100644 index 55aa746..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -nochange diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple7/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/_package b/tests/repairwc_fixtures/osctest/simple7/.osc/_package deleted file mode 100644 index c0cec07..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple7 diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/_project b/tests/repairwc_fixtures/osctest/simple7/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/_to_be_added b/tests/repairwc_fixtures/osctest/simple7/.osc/_to_be_added deleted file mode 100644 index 323fae0..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple7/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/foo b/tests/repairwc_fixtures/osctest/simple7/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/merge b/tests/repairwc_fixtures/osctest/simple7/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple7/.osc/nochange b/tests/repairwc_fixtures/osctest/simple7/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple7/foobar b/tests/repairwc_fixtures/osctest/simple7/foobar deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/foobar +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/simple7/merge b/tests/repairwc_fixtures/osctest/simple7/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple7/nochange b/tests/repairwc_fixtures/osctest/simple7/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple7/toadd1 b/tests/repairwc_fixtures/osctest/simple7/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple7/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/_apiurl b/tests/repairwc_fixtures/osctest/simple8/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/_files b/tests/repairwc_fixtures/osctest/simple8/.osc/_files deleted file mode 100644 index cd725ff..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/_files +++ /dev/null @@ -1,6 +0,0 @@ -<directory name="simple8" 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" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="42" skipped="true" /> -</directory> diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/simple8/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/_package b/tests/repairwc_fixtures/osctest/simple8/.osc/_package deleted file mode 100644 index fc76adf..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple8 diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/_project b/tests/repairwc_fixtures/osctest/simple8/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/_to_be_added b/tests/repairwc_fixtures/osctest/simple8/.osc/_to_be_added deleted file mode 100644 index 323fae0..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/simple8/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/foo b/tests/repairwc_fixtures/osctest/simple8/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/merge b/tests/repairwc_fixtures/osctest/simple8/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/nochange b/tests/repairwc_fixtures/osctest/simple8/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/simple8/.osc/skipped b/tests/repairwc_fixtures/osctest/simple8/.osc/skipped deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/.osc/skipped +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/simple8/merge b/tests/repairwc_fixtures/osctest/simple8/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/simple8/nochange b/tests/repairwc_fixtures/osctest/simple8/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/simple8/toadd1 b/tests/repairwc_fixtures/osctest/simple8/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/simple8/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/osctest/working_empty/.osc/_apiurl b/tests/repairwc_fixtures/osctest/working_empty/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/working_empty/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/working_empty/.osc/_files b/tests/repairwc_fixtures/osctest/working_empty/.osc/_files deleted file mode 100644 index 9814121..0000000 --- a/tests/repairwc_fixtures/osctest/working_empty/.osc/_files +++ /dev/null @@ -1 +0,0 @@ -<directory /> diff --git a/tests/repairwc_fixtures/osctest/working_empty/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/working_empty/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/working_empty/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/working_empty/.osc/_package b/tests/repairwc_fixtures/osctest/working_empty/.osc/_package deleted file mode 100644 index 4b1dcd1..0000000 --- a/tests/repairwc_fixtures/osctest/working_empty/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -working_empty diff --git a/tests/repairwc_fixtures/osctest/working_empty/.osc/_project b/tests/repairwc_fixtures/osctest/working_empty/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/repairwc_fixtures/osctest/working_empty/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_apiurl b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_files b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_files deleted file mode 100644 index 9fa8a9f..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="working_nonempty" 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/repairwc_fixtures/osctest/working_nonempty/.osc/_in_conflict b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_in_conflict deleted file mode 100644 index 55aa746..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -nochange diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_osclib_version b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_package b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_package deleted file mode 100644 index 6ece159..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -working_nonempty diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_project b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_to_be_added b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_to_be_added deleted file mode 100644 index 323fae0..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_to_be_deleted b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/foo b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/merge b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/nochange b/tests/repairwc_fixtures/osctest/working_nonempty/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/foobar b/tests/repairwc_fixtures/osctest/working_nonempty/foobar deleted file mode 100644 index e69de29..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/foobar +++ /dev/null diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/merge b/tests/repairwc_fixtures/osctest/working_nonempty/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/nochange b/tests/repairwc_fixtures/osctest/working_nonempty/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/repairwc_fixtures/osctest/working_nonempty/toadd1 b/tests/repairwc_fixtures/osctest/working_nonempty/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/repairwc_fixtures/osctest/working_nonempty/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_apiurl b/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_apiurl deleted file mode 100644 index c2401e4..0000000 --- a/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -noschemeandnotld diff --git a/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_packages b/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_packages deleted file mode 100644 index 9b61f30..0000000 --- a/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="prj_noapiurl" /> diff --git a/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_project b/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_project deleted file mode 100644 index d3dc1c2..0000000 --- a/tests/repairwc_fixtures/prj_invalidapiurl/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -prj_invalidapiurl diff --git a/tests/repairwc_fixtures/prj_noapiurl/.osc/_packages b/tests/repairwc_fixtures/prj_noapiurl/.osc/_packages deleted file mode 100644 index 9b61f30..0000000 --- a/tests/repairwc_fixtures/prj_noapiurl/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="prj_noapiurl" /> diff --git a/tests/repairwc_fixtures/prj_noapiurl/.osc/_project b/tests/repairwc_fixtures/prj_noapiurl/.osc/_project deleted file mode 100644 index 08c78d8..0000000 --- a/tests/repairwc_fixtures/prj_noapiurl/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -prj_noapiurl diff --git a/tests/request_fixtures/oscrc b/tests/request_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/request_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/request_fixtures/test_read_request1.xml b/tests/request_fixtures/test_read_request1.xml deleted file mode 100644 index 8780781..0000000 --- a/tests/request_fixtures/test_read_request1.xml +++ /dev/null @@ -1,17 +0,0 @@ -<request id="42"> - <action type="submit"> - <source package="bar" project="foo" rev="1" /> - <target package="bar" project="foobar" /> - </action> - <action type="delete"> - <target project="deleteme" /> - </action> - <state name="accepted" when="2010-12-27T01:36:29" who="user1" /> - <history name="new" when="2010-12-13T13:02:03" who="creator"> - <comment>foobar</comment> - </history> - <title>title of the request</title> - <description>this is a -very long -description</description> -</request> diff --git a/tests/request_fixtures/test_read_request2.xml b/tests/request_fixtures/test_read_request2.xml deleted file mode 100644 index 52d5808..0000000 --- a/tests/request_fixtures/test_read_request2.xml +++ /dev/null @@ -1,19 +0,0 @@ -<request id="123"> - <action type="submit"> - <source package="abc" project="xyz" /> - <options> - <sourceupdate>cleanup</sourceupdate> - <updatelink>1</updatelink> - </options> - </action> - <action type="add_role"> - <target project="home:foo" /> - <person name="bar" role="maintainer" /> - <group name="groupxyz" role="reader" /> - </action> - <state name="review" when="2010-12-27T01:36:29" who="abc" /> - <review by_group="group1" state="new" when="2010-12-28T00:11:22" who="abc"> - <comment>review start</comment> - </review> - <history name="new" when="2010-12-11T00:00:00" who="creator" /> -</request> diff --git a/tests/request_fixtures/test_request_list_view1.xml b/tests/request_fixtures/test_request_list_view1.xml deleted file mode 100644 index a0117b2..0000000 --- a/tests/request_fixtures/test_request_list_view1.xml +++ /dev/null @@ -1,36 +0,0 @@ -<request id="62"> - <action type="set_bugowner"> - <target project="foo" /> - <person name="buguser" /> - </action> - <action type="add_role"> - <target project="foobar" /> - <person name="xyz" role="maintainer" /> - <group name="group1" role="reader" /> - </action> - <action type="add_role"> - <target project="foo" package="bar" /> - <person name="abc" role="reviewer" /> - </action> - <action type="change_devel"> - <source project="devprj" package="devpkg" /> - <target project="foo" package="bar" /> - </action> - <action type="submit"> - <source project="srcprj" package="srcpackage" /> - <target project="tgtprj" package="tgtpackage" /> - </action> - <action type="submit"> - <source project="foo" package="bar" /> - <target project="baz" /> - </action> - <action type="delete"> - <target project="deleteme" /> - </action> - <action type="delete"> - <target project="foo" package="bar" /> - </action> - <state name="new" when="2010-12-29T14:57:25" who="Admin"> - <comment></comment> - </state> -</request> diff --git a/tests/request_fixtures/test_request_list_view2.xml b/tests/request_fixtures/test_request_list_view2.xml deleted file mode 100644 index 976c155..0000000 --- a/tests/request_fixtures/test_request_list_view2.xml +++ /dev/null @@ -1,14 +0,0 @@ -<request id="21"> - <action type="set_bugowner"> - <target project="foo" /> - <person name="buguser" /> - </action> - <state name="accepted" when="2010-12-29T16:37:45" who="foobar" /> - <history name="new" when="2010-12-28T16:37:45" who="user" /> - <history name="review" when="2010-12-28T18:37:45" who="foobar" /> - <description>This is -a simple request with a lot of ... ... text and other stuff. This request also contains a -description. This is useful to -describe the request. blabla -blabla</description> -</request> diff --git a/tests/request_fixtures/test_request_str1.xml b/tests/request_fixtures/test_request_str1.xml deleted file mode 100644 index ee5aa9b..0000000 --- a/tests/request_fixtures/test_request_str1.xml +++ /dev/null @@ -1,30 +0,0 @@ -<request id="123"> - <action type="submit"> - <source package="abc" project="xyz" /> - <target project="foo" /> - <options> - <sourceupdate>cleanup</sourceupdate> - <updatelink>1</updatelink> - </options> - </action> - <action type="add_role"> - <target project="home:foo" /> - <person name="bar" role="maintainer" /> - <group name="groupxyz" role="reader" /> - </action> - <state name="review" when="2010-12-27T01:36:29" who="abc"> - <comment>currently in review</comment> - </state> - <review by_group="group1" state="new" when="2010-12-28T00:11:22" who="abc"> - <comment>review start</comment> - </review> - <review by_group="group1" state="accepted" when="2010-12-29T00:11:22" who="abc"> - <comment>accepted</comment> - </review> - <history name="new" when="2010-12-11T00:00:00" who="creator" /> - <history name="revoked" when="2010-12-12T00:00:00" who="creator" /> - <description>just a samll description -in order to describe this -request - blablabla -test.</description> -</request> diff --git a/tests/revertfile_fixtures/oscrc b/tests/revertfile_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/revertfile_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/revertfile_fixtures/osctest/.osc/_apiurl b/tests/revertfile_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/revertfile_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/revertfile_fixtures/osctest/.osc/_packages b/tests/revertfile_fixtures/osctest/.osc/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/revertfile_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/revertfile_fixtures/osctest/.osc/_project b/tests/revertfile_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/revertfile_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_apiurl b/tests/revertfile_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_files b/tests/revertfile_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index 5dbd576..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,10 +0,0 @@ -<directory name="conflict" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" 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="eb9c2bf0eb63f3a7bc0ea37ef18aeba5" mtime="1282730880" name="somefile" size="13" /> - <entry md5="81be947db54c2e225dc8eacce64d8a4a" mtime="1282731457" name="replaced" size="17" /> - <entry md5="676513fde5797c3785164942c97dfec1" mtime="1282731738" name="missing" size="8" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="deleted" size="9" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="12" skipped="true" /> -</directory> diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_in_conflict b/tests/revertfile_fixtures/osctest/simple/.osc/_in_conflict deleted file mode 100644 index 257cc56..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_osclib_version b/tests/revertfile_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_package b/tests/revertfile_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_project b/tests/revertfile_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_added b/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_added deleted file mode 100644 index 1f4923c..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_added +++ /dev/null @@ -1,3 +0,0 @@ -toadd1 -replaced -addedmissing diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted b/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted deleted file mode 100644 index 08f95e5..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted +++ /dev/null @@ -1,2 +0,0 @@ -somefile -deleted diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/deleted b/tests/revertfile_fixtures/osctest/simple/.osc/deleted deleted file mode 100644 index e69de29..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/deleted +++ /dev/null diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/foo b/tests/revertfile_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/merge b/tests/revertfile_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/missing b/tests/revertfile_fixtures/osctest/simple/.osc/missing deleted file mode 100644 index 33e45d5..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/missing +++ /dev/null @@ -1 +0,0 @@ -missing diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/nochange b/tests/revertfile_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/replaced b/tests/revertfile_fixtures/osctest/simple/.osc/replaced deleted file mode 100644 index 7c3f1a8..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/replaced +++ /dev/null @@ -1 +0,0 @@ -yet another file diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/somefile b/tests/revertfile_fixtures/osctest/simple/.osc/somefile deleted file mode 100644 index 2ef267e..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/somefile +++ /dev/null @@ -1 +0,0 @@ -some content diff --git a/tests/revertfile_fixtures/osctest/simple/foo b/tests/revertfile_fixtures/osctest/simple/foo deleted file mode 100644 index ad9621d..0000000 --- a/tests/revertfile_fixtures/osctest/simple/foo +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< foo.mine -This is no test. -======= -This is a simple test. ->>>>>>> foo.r2 diff --git a/tests/revertfile_fixtures/osctest/simple/merge b/tests/revertfile_fixtures/osctest/simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/revertfile_fixtures/osctest/simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/revertfile_fixtures/osctest/simple/nochange b/tests/revertfile_fixtures/osctest/simple/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/revertfile_fixtures/osctest/simple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/revertfile_fixtures/osctest/simple/replaced b/tests/revertfile_fixtures/osctest/simple/replaced deleted file mode 100644 index f479fb8..0000000 --- a/tests/revertfile_fixtures/osctest/simple/replaced +++ /dev/null @@ -1 +0,0 @@ -foo replaced diff --git a/tests/revertfile_fixtures/osctest/simple/toadd1 b/tests/revertfile_fixtures/osctest/simple/toadd1 deleted file mode 100644 index 1592423..0000000 --- a/tests/revertfile_fixtures/osctest/simple/toadd1 +++ /dev/null @@ -1 +0,0 @@ -toadd1 diff --git a/tests/revertfile_fixtures/osctest/simple/toadd2 b/tests/revertfile_fixtures/osctest/simple/toadd2 deleted file mode 100644 index 6f1ab97..0000000 --- a/tests/revertfile_fixtures/osctest/simple/toadd2 +++ /dev/null @@ -1 +0,0 @@ -toadd2 diff --git a/tests/setlinkrev_fixtures/baserev_filesremote b/tests/setlinkrev_fixtures/baserev_filesremote deleted file mode 100644 index de5d664..0000000 --- a/tests/setlinkrev_fixtures/baserev_filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="srcpkg" rev="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" srcmd5="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1"> - <linkinfo project="srcsrcprj" package="srcsrcpkg" srcmd5="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" baserev="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" xsrcmd5="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" lsrcmd5="cccccccccccccccccccccccccccccccc" /> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="_link" size="23" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> -</directory> diff --git a/tests/setlinkrev_fixtures/expandedsrc_filesremote b/tests/setlinkrev_fixtures/expandedsrc_filesremote deleted file mode 100644 index ad4d2a6..0000000 --- a/tests/setlinkrev_fixtures/expandedsrc_filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="srcpkg" rev="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" srcmd5="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1"> - <linkinfo project="srcsrcprj" package="srcsrcpkg" srcmd5="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" baserev="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" xsrcmd5="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" lsrcmd5="cccccccccccccccccccccccccccccccc" /> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="_link" size="23" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> -</directory> diff --git a/tests/setlinkrev_fixtures/noproject_link b/tests/setlinkrev_fixtures/noproject_link deleted file mode 100644 index 9f45c4f..0000000 --- a/tests/setlinkrev_fixtures/noproject_link +++ /dev/null @@ -1 +0,0 @@ -<link package="srcpkg" /> diff --git a/tests/setlinkrev_fixtures/oscrc b/tests/setlinkrev_fixtures/oscrc deleted file mode 100644 index a30e040..0000000 --- a/tests/setlinkrev_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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/setlinkrev_fixtures/rev_link b/tests/setlinkrev_fixtures/rev_link deleted file mode 100644 index 1c16c99..0000000 --- a/tests/setlinkrev_fixtures/rev_link +++ /dev/null @@ -1 +0,0 @@ -<link package="srcpkg" project="srcprj" rev="42" /> diff --git a/tests/setlinkrev_fixtures/simple_filesremote b/tests/setlinkrev_fixtures/simple_filesremote deleted file mode 100644 index 0e5319f..0000000 --- a/tests/setlinkrev_fixtures/simple_filesremote +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="srcpkg" rev="42" srcmd5="ffffffffffffffffffffffffffffffff" vrev="1"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> -</directory> diff --git a/tests/setlinkrev_fixtures/simple_link b/tests/setlinkrev_fixtures/simple_link deleted file mode 100644 index 20db65a..0000000 --- a/tests/setlinkrev_fixtures/simple_link +++ /dev/null @@ -1 +0,0 @@ -<link package="srcpkg" project="srcprj" /> diff --git a/tests/suite.py b/tests/suite.py deleted file mode 100644 index 0987b37..0000000 --- a/tests/suite.py +++ /dev/null @@ -1,46 +0,0 @@ -import os.path -import sys -import unittest - -try: - import xmlrunner # JUnit like XML reporting - have_xmlrunner = True -except ImportError: - have_xmlrunner = False - -import test_update -import test_addfiles -import test_deletefiles -import test_revertfiles -import test_difffiles -import test_init_package -import test_init_project -import test_commit -import test_repairwc -import test_package_status -import test_project_status -import test_request -import test_setlinkrev -import test_prdiff - -suite = unittest.TestSuite() -suite.addTests(test_addfiles.suite()) -suite.addTests(test_deletefiles.suite()) -suite.addTests(test_revertfiles.suite()) -suite.addTests(test_update.suite()) -suite.addTests(test_difffiles.suite()) -suite.addTests(test_init_package.suite()) -suite.addTests(test_init_project.suite()) -suite.addTests(test_commit.suite()) -suite.addTests(test_repairwc.suite()) -suite.addTests(test_package_status.suite()) -suite.addTests(test_project_status.suite()) -suite.addTests(test_request.suite()) -suite.addTests(test_setlinkrev.suite()) -suite.addTests(test_prdiff.suite()) - -if have_xmlrunner: - result = xmlrunner.XMLTestRunner(output=os.path.join(os.getcwd(), 'junit-xml-results')).run(suite) -else: - result = unittest.TextTestRunner(verbosity=1).run(suite) -sys.exit(not result.wasSuccessful()) diff --git a/tests/test_addfiles.py b/tests/test_addfiles.py deleted file mode 100644 index 129bc4d..0000000 --- a/tests/test_addfiles.py +++ /dev/null @@ -1,85 +0,0 @@ -import osc.core -import osc.oscerr -import os -import sys -from common import OscTestCase - -FIXTURES_DIR = os.path.join(os.getcwd(), 'addfile_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestAddFiles) - -class TestAddFiles(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def testSimpleAdd(self): - """add one file ('toadd1') to the wc""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.addfile('toadd1') - exp = 'A toadd1\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1'))) - self._check_status(p, 'toadd1', 'A') - self._check_addlist('toadd1\n') - - def testSimpleMultipleAdd(self): - """add multiple files ('toadd1', 'toadd2') to the wc""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.addfile('toadd1') - p.addfile('toadd2') - exp = 'A toadd1\nA toadd2\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1'))) - self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd2'))) - self._check_status(p, 'toadd1', 'A') - self._check_status(p, 'toadd2', 'A') - self._check_addlist('toadd1\ntoadd2\n') - - def testAddVersionedFile(self): - """add a versioned file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - self.assertRaises(osc.oscerr.PackageFileConflict, p.addfile, 'merge') - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added'))) - self._check_status(p, 'merge', ' ') - - def testAddUnversionedFileTwice(self): - """add the same file twice""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.addfile('toadd1') - self.assertRaises(osc.oscerr.PackageFileConflict, p.addfile, 'toadd1') - exp = 'A toadd1\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1'))) - self._check_status(p, 'toadd1', 'A') - self._check_addlist('toadd1\n') - - def testReplace(self): - """replace a deleted file ('foo')""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - open('foo', 'w').write('replaced file\n') - p.addfile('foo') - exp = 'A foo\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertTrue(os.path.exists(os.path.join('.osc', 'foo'))) - self.assertNotEqual(open(os.path.join('.osc', 'foo'), 'r').read(), 'replaced file\n') - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self._check_status(p, 'foo', 'R') - self._check_addlist('foo\n') - - def testAddNonExistentFile(self): - """add a non existent file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - self.assertRaises(osc.oscerr.OscIOError, p.addfile, 'doesnotexist') - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added'))) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_commit.py b/tests/test_commit.py deleted file mode 100644 index ce93e28..0000000 --- a/tests/test_commit.py +++ /dev/null @@ -1,292 +0,0 @@ -import osc.core -import osc.oscerr -import os -import sys -from common import GET, PUT, POST, DELETE, OscTestCase -from xml.etree import cElementTree as ET -FIXTURES_DIR = os.path.join(os.getcwd(), 'commit_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestCommit) - -rev_dummy = '<revision rev="repository">\n <srcmd5>empty</srcmd5>\n</revision>' - -class TestCommit(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - @GET('http://localhost/source/osctest/simple?rev=latest', file='testSimple_filesremote') - @POST('http://localhost/source/osctest/simple?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin', - file='testSimple_missingfilelist', expfile='testSimple_lfilelist') - @PUT('http://localhost/source/osctest/simple/nochange?rev=repository', - exp='This file didn\'t change but\nis modified.\n', text=rev_dummy) - @POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin', - file='testSimple_cfilesremote', expfile='testSimple_lfilelist') - def test_simple(self): - """a simple commit (only one modified file)""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.commit() - exp = 'Sending nochange\nTransmitting file data .\nCommitted revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testSimple_cfilesremote') - self.assertTrue(os.path.exists('nochange')) - self.assertEqual(open('nochange', 'r').read(), open(os.path.join('.osc', 'nochange'), 'r').read()) - self._check_status(p, 'nochange', ' ') - self._check_status(p, 'foo', ' ') - self._check_status(p, 'merge', ' ') - - @GET('http://localhost/source/osctest/add?rev=latest', file='testAddfile_filesremote') - @POST('http://localhost/source/osctest/add?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin', - file='testAddfile_missingfilelist', expfile='testAddfile_lfilelist') - @PUT('http://localhost/source/osctest/add/add?rev=repository', - exp='added file\n', text=rev_dummy) - @POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin', - file='testAddfile_cfilesremote', expfile='testAddfile_lfilelist') - def test_addfile(self): - """commit a new file""" - self._change_to_pkg('add') - p = osc.core.Package('.') - p.commit() - exp = 'Sending add\nTransmitting file data .\nCommitted revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testAddfile_cfilesremote') - self.assertTrue(os.path.exists('add')) - self.assertEqual(open('add', 'r').read(), open(os.path.join('.osc', 'add'), 'r').read()) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added'))) - self._check_status(p, 'add', ' ') - self._check_status(p, 'foo', ' ') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'nochange', ' ') - - @GET('http://localhost/source/osctest/delete?rev=latest', file='testDeletefile_filesremote') - @POST('http://localhost/source/osctest/delete?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/delete?comment=&cmd=commitfilelist&user=Admin', - file='testDeletefile_cfilesremote', expfile='testDeletefile_lfilelist') - def test_deletefile(self): - """delete a file""" - self._change_to_pkg('delete') - p = osc.core.Package('.') - p.commit() - exp = 'Deleting nochange\nTransmitting file data \nCommitted revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testDeletefile_cfilesremote') - self.assertFalse(os.path.exists('nochange')) - self.assertFalse(os.path.exists(os.path.join('.osc', 'nochange'))) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self._check_status(p, 'foo', ' ') - self._check_status(p, 'merge', ' ') - - @GET('http://localhost/source/osctest/conflict?rev=latest', file='testConflictfile_filesremote') - @POST('http://localhost/source/osctest/conflict?cmd=getprojectservices', - exp='', text='<services />') - def test_conflictfile(self): - """package has a file which is in conflict state""" - self._change_to_pkg('conflict') - ret = osc.core.Package('.').commit() - self.assertTrue(ret == 1) - exp = 'Please resolve all conflicts before committing using "osc resolved FILE"!\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testConflictfile_filesremote') - self._check_conflictlist('merge\n') - - @GET('http://localhost/source/osctest/nochanges?rev=latest', file='testNoChanges_filesremote') - @POST('http://localhost/source/osctest/nochanges?cmd=getprojectservices', - exp='', text='<services />') - def test_nochanges(self): - """package has no changes (which can be committed)""" - self._change_to_pkg('nochanges') - p = osc.core.Package('.') - ret = p.commit() - self.assertTrue(ret == 1) - exp = 'nothing to do for package nochanges\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_status(p, 'foo', 'S') - self._check_status(p, 'merge', '!') - self._check_status(p, 'nochange', ' ') - - @GET('http://localhost/source/osctest/multiple?rev=latest', file='testMultiple_filesremote') - @POST('http://localhost/source/osctest/multiple?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin', - file='testMultiple_missingfilelist', expfile='testMultiple_lfilelist') - @PUT('http://localhost/source/osctest/multiple/nochange?rev=repository', exp='This file did change.\n', text=rev_dummy) - @PUT('http://localhost/source/osctest/multiple/add?rev=repository', exp='added file\n', text=rev_dummy) - @PUT('http://localhost/source/osctest/multiple/add2?rev=repository', exp='add2\n', text=rev_dummy) - @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin', - file='testMultiple_cfilesremote', expfile='testMultiple_lfilelist') - def test_multiple(self): - """a simple commit (only one modified file)""" - self._change_to_pkg('multiple') - p = osc.core.Package('.') - p.commit() - exp = 'Deleting foo\nDeleting merge\nSending nochange\n' \ - 'Sending add\nSending add2\nTransmitting file data ...\nCommitted revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testMultiple_cfilesremote') - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added'))) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self.assertFalse(os.path.exists(os.path.join('.osc', 'foo'))) - self.assertFalse(os.path.exists(os.path.join('.osc', 'merge'))) - self.assertRaises(osc.oscerr.OscIOError, p.status, 'foo') - self.assertRaises(osc.oscerr.OscIOError, p.status, 'merge') - self._check_status(p, 'add', ' ') - self._check_status(p, 'add2', ' ') - self._check_status(p, 'nochange', ' ') - - @GET('http://localhost/source/osctest/multiple?rev=latest', file='testPartial_filesremote') - @POST('http://localhost/source/osctest/multiple?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin', - file='testPartial_missingfilelist', expfile='testPartial_lfilelist') - @PUT('http://localhost/source/osctest/multiple/add?rev=repository', exp='added file\n', text=rev_dummy) - @PUT('http://localhost/source/osctest/multiple/nochange?rev=repository', exp='This file did change.\n', text=rev_dummy) - @POST('http://localhost/source/osctest/multiple?comment=&cmd=commitfilelist&user=Admin', - file='testPartial_cfilesremote', expfile='testPartial_lfilelist') - def test_partial(self): - """commit only some files""" - self._change_to_pkg('multiple') - p = osc.core.Package('.') - p.todo = ['foo', 'add', 'nochange'] - p.commit() - exp = 'Deleting foo\nSending nochange\n' \ - 'Sending add\nTransmitting file data ..\nCommitted revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testPartial_cfilesremote') - self._check_addlist('add2\n') - self._check_deletelist('merge\n') - self._check_status(p, 'add2', 'A') - self._check_status(p, 'merge', 'D') - self._check_status(p, 'add', ' ') - self._check_status(p, 'nochange', ' ') - self.assertRaises(osc.oscerr.OscIOError, p.status, 'foo') - - @GET('http://localhost/source/osctest/simple?rev=latest', file='testSimple_filesremote') - @POST('http://localhost/source/osctest/simple?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin', - file='testSimple_missingfilelist', expfile='testSimple_lfilelist') - @PUT('http://localhost/source/osctest/simple/nochange?rev=repository', exp='This file didn\'t change but\nis modified.\n', - exception=IOError('test exception'), text=rev_dummy) - def test_interrupt(self): - """interrupt a commit""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - self.assertRaises(IOError, p.commit) - exp = 'Sending nochange\nTransmitting file data .' - self.assertTrue(sys.stdout.getvalue(), exp) - self._check_digests('testSimple_filesremote') - self.assertTrue(os.path.exists('nochange')) - self._check_status(p, 'nochange', 'M') - - @GET('http://localhost/source/osctest/allstates?rev=latest', file='testPartial_filesremote') - @POST('http://localhost/source/osctest/allstates?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/allstates?comment=&cmd=commitfilelist&user=Admin', - file='testAllStates_missingfilelist', expfile='testAllStates_lfilelist') - @PUT('http://localhost/source/osctest/allstates/add?rev=repository', exp='added file\n', text=rev_dummy) - @PUT('http://localhost/source/osctest/allstates/missing?rev=repository', exp='replaced\n', text=rev_dummy) - @PUT('http://localhost/source/osctest/allstates/nochange?rev=repository', exp='This file did change.\n', text=rev_dummy) - @POST('http://localhost/source/osctest/allstates?comment=&cmd=commitfilelist&user=Admin', - file='testAllStates_cfilesremote', expfile='testAllStates_lfilelist') - def test_allstates(self): - """commit all files (all states are available except 'C')""" - self._change_to_pkg('allstates') - p = osc.core.Package('.') - p.commit() - exp = 'Deleting foo\nSending missing\nSending nochange\n' \ - 'Sending add\nTransmitting file data ...\nCommitted revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testAllStates_expfiles', 'skipped') - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added'))) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self.assertFalse(os.path.exists('foo')) - self.assertFalse(os.path.exists(os.path.join('.osc', 'foo'))) - self._check_status(p, 'add', ' ') - self._check_status(p, 'nochange', ' ') - self._check_status(p, 'merge', '!') - self._check_status(p, 'missing', ' ') - self._check_status(p, 'skipped', 'S') - self._check_status(p, 'test', ' ') - - @GET('http://localhost/source/osctest/add?rev=latest', file='testAddfile_filesremote') - @POST('http://localhost/source/osctest/add?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/add?comment=&cmd=commitfilelist&user=Admin', - file='testAddfile_cfilesremote', expfile='testAddfile_lfilelist') - def test_remoteexists(self): - """file 'add' should be committed but already exists on the server""" - self._change_to_pkg('add') - p = osc.core.Package('.') - p.commit() - exp = 'Sending add\nTransmitting file data \nCommitted revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testAddfile_cfilesremote') - self.assertTrue(os.path.exists('add')) - self.assertEqual(open('add', 'r').read(), open(os.path.join('.osc', 'add'), 'r').read()) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added'))) - self._check_status(p, 'add', ' ') - self._check_status(p, 'foo', ' ') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'nochange', ' ') - - @GET('http://localhost/source/osctest/branch?rev=latest', file='testExpand_filesremote') - @POST('http://localhost/source/osctest/branch?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/branch?comment=&cmd=commitfilelist&user=Admin&keeplink=1', - file='testExpand_missingfilelist', expfile='testExpand_lfilelist') - @PUT('http://localhost/source/osctest/branch/simple?rev=repository', exp='simple modified file.\n', text=rev_dummy) - @POST('http://localhost/source/osctest/branch?comment=&cmd=commitfilelist&user=Admin&keeplink=1', - file='testExpand_cfilesremote', expfile='testExpand_lfilelist') - @GET('http://localhost/source/osctest/branch?rev=87ea02aede261b0267aabaa97c756e7a', file='testExpand_expandedfilesremote') - def test_expand(self): - """commit an expanded package""" - self._change_to_pkg('branch') - p = osc.core.Package('.') - p.commit() - exp = 'Sending simple\nTransmitting file data .\nCommitted revision 7.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testExpand_expandedfilesremote') - self._check_status(p, 'simple', ' ') - - @GET('http://localhost/source/osctest/added_missing?rev=latest', file='testAddedMissing_filesremote') - @POST('http://localhost/source/osctest/added_missing?cmd=getprojectservices', - exp='', text='<services />') - def test_added_missing(self): - """commit an added file which is missing""" - self._change_to_pkg('added_missing') - p = osc.core.Package('.') - ret = p.commit() - self.assertTrue(ret == 1) - exp = 'file \'add\' is marked as \'A\' but does not exist\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_status(p, 'add', '!') - - @GET('http://localhost/source/osctest/added_missing?rev=latest', file='testAddedMissing_filesremote') - @POST('http://localhost/source/osctest/added_missing?cmd=getprojectservices', - exp='', text='<services />') - @POST('http://localhost/source/osctest/added_missing?comment=&cmd=commitfilelist&user=Admin', - file='testAddedMissing_missingfilelist', expfile='testAddedMissing_lfilelist') - @PUT('http://localhost/source/osctest/added_missing/bar?rev=repository', exp='foobar\n', text=rev_dummy) - @POST('http://localhost/source/osctest/added_missing?comment=&cmd=commitfilelist&user=Admin', - file='testAddedMissing_cfilesremote', expfile='testAddedMissing_lfilelist') - def test_added_missing2(self): - """commit an added file, another added file missing (but it's not part of the commit)""" - self._change_to_pkg('added_missing') - p = osc.core.Package('.') - p.todo = ['bar'] - p.commit() - exp = 'Sending bar\nTransmitting file data .\nCommitted revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_status(p, 'add', '!') - self._check_status(p, 'bar', ' ') - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_deletefiles.py b/tests/test_deletefiles.py deleted file mode 100644 index 8b38c36..0000000 --- a/tests/test_deletefiles.py +++ /dev/null @@ -1,207 +0,0 @@ -import osc.core -import osc.oscerr -import os -from common import OscTestCase - -FIXTURES_DIR = os.path.join(os.getcwd(), 'deletefile_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestDeleteFiles) - -class TestDeleteFiles(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def testSimpleRemove(self): - """delete a file ('foo') from the wc""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('foo') - self.__check_ret(ret, True, ' ') - self.assertFalse(os.path.exists('foo')) - self.assertTrue(os.path.exists(os.path.join('.osc', 'foo'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - - def testDeleteModified(self): - """delete modified file ('nochange') from the wc (without force)""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('nochange') - self.__check_ret(ret, False, 'M') - self.assertTrue(os.path.exists('nochange')) - self.assertTrue(os.path.exists(os.path.join('.osc', 'nochange'))) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self._check_status(p, 'nochange', 'M') - - def testDeleteUnversioned(self): - """delete an unversioned file ('toadd2') from the wc""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('toadd2') - self.__check_ret(ret, False, '?') - self.assertTrue(os.path.exists('toadd2')) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self._check_status(p, 'toadd2', '?') - - def testDeleteAdded(self): - """delete an added file ('toadd1') from the wc (without force)""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('toadd1') - self.__check_ret(ret, False, 'A') - self.assertTrue(os.path.exists('toadd1')) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self._check_status(p, 'toadd1', 'A') - - def testDeleteReplaced(self): - """delete an added file ('merge') from the wc (without force)""" - self._change_to_pkg('replace') - p = osc.core.Package('.') - ret = p.delete_file('merge') - self.__check_ret(ret, False, 'R') - self.assertTrue(os.path.exists('merge')) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self._check_addlist('toadd1\nmerge\n') - self._check_status(p, 'merge', 'R') - - def testDeleteConflict(self): - """delete a file ('foo', state='C') from the wc (without force)""" - self._change_to_pkg('conflict') - p = osc.core.Package('.') - ret = p.delete_file('foo') - self.__check_ret(ret, False, 'C') - 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._check_conflictlist('foo\n') - self._check_status(p, 'foo', 'C') - - def testDeleteModifiedForce(self): - """force deletion modified file ('nochange') from wc""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('nochange', force=True) - self.__check_ret(ret, True, 'M') - self.assertFalse(os.path.exists('nochange')) - self.assertTrue(os.path.exists(os.path.join('.osc', 'nochange'))) - self._check_deletelist('nochange\n') - self._check_status(p, 'nochange', 'D') - - def testDeleteUnversionedForce(self): - """delete an unversioned file ('toadd2') from the wc (with force)""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('toadd2', force=True) - self.__check_ret(ret, True, '?') - self.assertFalse(os.path.exists('toadd2')) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self.assertRaises(osc.oscerr.OscIOError, p.status, 'toadd2') - - def testDeleteAddedForce(self): - """delete an added file ('toadd1') from the wc (with force)""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('toadd1', force=True) - self.__check_ret(ret, True, 'A') - self.assertFalse(os.path.exists('toadd1')) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added'))) - self.assertRaises(osc.oscerr.OscIOError, p.status, 'toadd1') - - def testDeleteReplacedForce(self): - """delete an added file ('merge') from the wc (with force)""" - self._change_to_pkg('replace') - p = osc.core.Package('.') - ret = p.delete_file('merge', force=True) - self.__check_ret(ret, True, 'R') - self.assertFalse(os.path.exists('merge')) - self.assertTrue(os.path.exists(os.path.join('.osc', 'merge'))) - self._check_deletelist('merge\n') - self._check_addlist('toadd1\n') - self._check_status(p, 'merge', 'D') - - def testDeleteConflictForce(self): - """delete a file ('foo', state='C') from the wc (with force)""" - self._change_to_pkg('conflict') - p = osc.core.Package('.') - ret = p.delete_file('foo', force=True) - self.__check_ret(ret, True, 'C') - self.assertFalse(os.path.exists('foo')) - self.assertTrue(os.path.exists('foo.r2')) - self.assertTrue(os.path.exists('foo.mine')) - self.assertTrue(os.path.exists(os.path.join('.osc', 'foo'))) - self._check_deletelist('foo\n') - self.assertFalse(os.path.exists(os.path.join('.osc', '_in_conflict'))) - self._check_status(p, 'foo', 'D') - - def testDeleteMultiple(self): - """delete mutliple files from the wc""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('foo') - self.__check_ret(ret, True, ' ') - ret = p.delete_file('merge') - self.__check_ret(ret, True, ' ') - self.assertFalse(os.path.exists('foo')) - self.assertFalse(os.path.exists('merge')) - self.assertTrue(os.path.exists(os.path.join('.osc', 'foo'))) - self.assertTrue(os.path.exists(os.path.join('.osc', 'merge'))) - self._check_deletelist('foo\nmerge\n') - - def testDeleteAlreadyDeleted(self): - """delete already deleted file from the wc""" - self._change_to_pkg('already_deleted') - p = osc.core.Package('.') - ret = p.delete_file('foo') - self.__check_ret(ret, True, 'D') - self.assertFalse(os.path.exists('foo')) - self.assertTrue(os.path.exists(os.path.join('.osc', 'foo'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - - def testDeleteAddedMissing(self): - """ - delete a file which was added to the wc and is removed again - (via a non osc command). It's current state is '!' - """ - self._change_to_pkg('delete') - p = osc.core.Package('.') - ret = p.delete_file('toadd1') - self.__check_ret(ret, True, '!') - self.assertFalse(os.path.exists('toadd1')) - self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1'))) - self._check_deletelist('foo\n') - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added'))) - - def testDeleteSkippedLocalNotExistent(self): - """ - delete a skipped file: no local file with that name exists - """ - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('skipped') - self.__check_ret(ret, False, 'S') - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - - def testDeleteSkippedLocalExistent(self): - """ - delete a skipped file: a local file with that name exists and will be deleted - (for instance _service:* files have status 'S' but a local files might exist) - """ - self._change_to_pkg('simple') - p = osc.core.Package('.') - ret = p.delete_file('skipped_exists') - self.__check_ret(ret, True, 'S') - self.assertFalse(os.path.exists('skipped_exists')) - self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_deleted'))) - - def __check_ret(self, ret, exp1, exp2): - self.assertTrue(len(ret) == 2) - self.assertTrue(ret[0] == exp1) - self.assertTrue(ret[1] == exp2) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_difffiles.py b/tests/test_difffiles.py deleted file mode 100644 index 43c8afe..0000000 --- a/tests/test_difffiles.py +++ /dev/null @@ -1,336 +0,0 @@ -import osc.core -import osc.oscerr -import os -import re -from common import GET, OscTestCase - -FIXTURES_DIR = os.path.join(os.getcwd(), 'difffile_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestDiffFiles) - -class TestDiffFiles(OscTestCase): - diff_hdr = 'Index: %s\n===================================================================' - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def testDiffUnmodified(self): - """diff an unmodified file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['merge'] - self.__check_diff(p, '', None) - - def testDiffAdded(self): - """diff an added file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['toadd1'] - exp = """%s ---- toadd1\t(revision 0) -+++ toadd1\t(revision 0) -@@ -0,0 +1,1 @@ -+toadd1 -""" % (TestDiffFiles.diff_hdr % 'toadd1') - self.__check_diff(p, exp, None) - - def testDiffRemoved(self): - """diff a removed file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['somefile'] - exp = """%s ---- somefile\t(revision 2) -+++ somefile\t(working copy) -@@ -1,1 +0,0 @@ --some content -""" % (TestDiffFiles.diff_hdr % 'somefile') - self.__check_diff(p, exp, None) - - def testDiffMissing(self): - """diff a missing file (missing files are ignored)""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['missing'] - self.__check_diff(p, '', None) - - def testDiffReplaced(self): - """diff a replaced file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['replaced'] - exp = """%s ---- replaced\t(revision 2) -+++ replaced\t(working copy) -@@ -1,1 +1,1 @@ --yet another file -+foo replaced -""" % (TestDiffFiles.diff_hdr % 'replaced') - self.__check_diff(p, exp, None) - - def testDiffSkipped(self): - """diff a skipped file (skipped files are ignored)""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['skipped'] - self.__check_diff(p, '', None) - - def testDiffConflict(self): - """diff a file which is in the conflict state""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['foo'] - exp = """%s ---- foo\t(revision 2) -+++ foo\t(working copy) -@@ -1,1 +1,5 @@ -+<<<<<<< foo.mine -+This is no test. -+======= - This is a simple test. -+>>>>>>> foo.r2 -""" % (TestDiffFiles.diff_hdr % 'foo') - self.__check_diff(p, exp, None) - - def testDiffModified(self): - """diff a modified file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['nochange'] - exp = """%s ---- nochange\t(revision 2) -+++ nochange\t(working copy) -@@ -1,1 +1,2 @@ --This file didn't change. -+This file didn't change but -+is modified. -""" % (TestDiffFiles.diff_hdr % 'nochange') - self.__check_diff(p, exp, None) - - def testDiffUnversioned(self): - """diff an unversioned file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['toadd2'] - self.assertRaises(osc.oscerr.OscIOError, self.__check_diff, p, '', None) - - def testDiffAddedMissing(self): - """diff a file which has satus 'A' but the local file does not exist""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['addedmissing'] - self.assertRaises(osc.oscerr.OscIOError, self.__check_diff, p, '', None) - - def testDiffMultipleFiles(self): - """diff multiple files""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['nochange', 'somefile'] - exp = """%s ---- nochange\t(revision 2) -+++ nochange\t(working copy) -@@ -1,1 +1,2 @@ --This file didn't change. -+This file didn't change but -+is modified. -%s ---- somefile\t(revision 2) -+++ somefile\t(working copy) -@@ -1,1 +0,0 @@ --some content -""" % (TestDiffFiles.diff_hdr % 'nochange', TestDiffFiles.diff_hdr % 'somefile') - self.__check_diff(p, exp, None) - - def testDiffReplacedEmptyTodo(self): - """diff a complete package""" - self._change_to_pkg('replaced') - p = osc.core.Package('.') - exp = """%s ---- replaced\t(revision 2) -+++ replaced\t(working copy) -@@ -1,1 +1,1 @@ --yet another file -+foo replaced -""" % (TestDiffFiles.diff_hdr % 'replaced') - self.__check_diff(p, exp, None) - - def testDiffBinaryAdded(self): - """diff an added binary file""" - self._change_to_pkg('binary') - p = osc.core.Package('.') - p.todo = ['binary_added'] - exp = """%s -Binary file 'binary_added' added. -""" % (TestDiffFiles.diff_hdr % 'binary_added') - self.__check_diff(p, exp, None) - - def testDiffBinaryDeleted(self): - """diff a deleted binary file""" - self._change_to_pkg('binary') - p = osc.core.Package('.') - p.todo = ['binary_deleted'] - exp = """%s -Binary file 'binary_deleted' deleted. -""" % (TestDiffFiles.diff_hdr % 'binary_deleted') - self.__check_diff(p, exp, None) - - def testDiffBinaryModified(self): - """diff a modified binary file""" - self._change_to_pkg('binary') - p = osc.core.Package('.') - p.todo = ['binary'] - exp = """%s -Binary file 'binary' has changed. -""" % (TestDiffFiles.diff_hdr % 'binary') - self.__check_diff(p, exp, None) - - # diff with revision - @GET('http://localhost/source/osctest/remote_simple_noadd?rev=3', file='testDiffRemoteNoChange_files') - def testDiffRemoteNoChange(self): - """diff against remote revision where no file changed""" - self._change_to_pkg('remote_simple_noadd') - p = osc.core.Package('.') - self.__check_diff(p, '', 3) - - @GET('http://localhost/source/osctest/remote_simple?rev=3', file='testDiffRemoteModified_files') - @GET('http://localhost/source/osctest/remote_simple/merge?rev=3', file='testDiffRemoteModified_merge') - def testDiffRemoteModified(self): - """diff against a remote revision with one modified file""" - self._change_to_pkg('remote_simple') - p = osc.core.Package('.') - exp = """%s ---- merge\t(revision 3) -+++ merge\t(working copy) -@@ -1,3 +1,4 @@ - Is it - possible to - merge this file? -+I hope so... -%s ---- toadd1\t(revision 0) -+++ toadd1\t(revision 0) -@@ -0,0 +1,1 @@ -+toadd1 -""" % (TestDiffFiles.diff_hdr % 'merge', TestDiffFiles.diff_hdr % 'toadd1') - self.__check_diff(p, exp, 3) - - @GET('http://localhost/source/osctest/remote_simple?rev=3', file='testDiffRemoteDeletedLocalAdded_files') - def testDiffRemoteNotExistingLocalAdded(self): - """ - a file which doesn't exist in a remote revision and - has status A in the wc - """ - self._change_to_pkg('remote_simple') - p = osc.core.Package('.') - exp = """%s ---- toadd1\t(revision 0) -+++ toadd1\t(revision 0) -@@ -0,0 +1,1 @@ -+toadd1 -""" % (TestDiffFiles.diff_hdr % 'toadd1') - self.__check_diff(p, exp, 3) - - @GET('http://localhost/source/osctest/remote_simple_noadd?rev=3', file='testDiffRemoteExistingLocalNotExisting_files') - @GET('http://localhost/source/osctest/remote_simple_noadd/foobar?rev=3', file='testDiffRemoteExistingLocalNotExisting_foobar') - @GET('http://localhost/source/osctest/remote_simple_noadd/binary?rev=3', file='testDiffRemoteExistingLocalNotExisting_binary') - def testDiffRemoteExistingLocalNotExisting(self): - """ - a file doesn't exist in the local wc but exists - in the remote revision - """ - self._change_to_pkg('remote_simple_noadd') - p = osc.core.Package('.') - exp = """%s ---- foobar\t(revision 3) -+++ foobar\t(working copy) -@@ -1,2 +0,0 @@ --foobar --barfoo -%s -Binary file 'binary' deleted. -""" % (TestDiffFiles.diff_hdr % 'foobar', TestDiffFiles.diff_hdr % 'binary') - self.__check_diff(p, exp, 3) - - @GET('http://localhost/source/osctest/remote_localmodified?rev=3', file='testDiffRemoteUnchangedLocalModified_files') - @GET('http://localhost/source/osctest/remote_localmodified/nochange?rev=3', file='testDiffRemoteUnchangedLocalModified_nochange') - @GET('http://localhost/source/osctest/remote_localmodified/binary?rev=3', file='testDiffRemoteUnchangedLocalModified_binary') - def testDiffRemoteUnchangedLocalModified(self): - """remote revision didn't change, local file is modified""" - self._change_to_pkg('remote_localmodified') - p = osc.core.Package('.') - exp = """%s ---- nochange\t(revision 3) -+++ nochange\t(working copy) -@@ -1,1 +1,2 @@ - This file didn't change. -+oh it does -%s -Binary file 'binary' has changed. -""" % (TestDiffFiles.diff_hdr % 'nochange', TestDiffFiles.diff_hdr % 'binary') - self.__check_diff(p, exp, 3) - - @GET('http://localhost/source/osctest/remote_simple_noadd?rev=3', file='testDiffRemoteMissingLocalExisting_files') - def testDiffRemoteMissingLocalExisting(self): - """ - remote revision misses a file which exists in the local wc (state ' ')""" - self._change_to_pkg('remote_simple_noadd') - p = osc.core.Package('.') - exp = """%s ---- foo\t(revision 0) -+++ foo\t(working copy) -@@ -0,0 +1,1 @@ -+This is a simple test. -""" % (TestDiffFiles.diff_hdr % 'foo') - self.__check_diff(p, exp, 3) - - @GET('http://localhost/source/osctest/remote_localdelete?rev=3', file='testDiffRemoteMissingLocalDeleted_files') - def testDiffRemoteMissingLocalDeleted(self): - """ - remote revision misses a file which is marked for - deletion in the local wc - """ - # empty diff is expected (svn does the same) - self._change_to_pkg('remote_localdelete') - p = osc.core.Package('.') - self.__check_diff(p, '', 3) - - def __check_diff(self, p, exp, revision=None): - got = '' - for i in p.get_diff(revision): - got += ''.join(i) - - # When a hunk header refers to a single line in the "from" - # file and/or the "to" file, e.g. - # - # @@ -37,37 +41,43 @@ - # @@ -37,39 +41,41 @@ - # @@ -37,37 +41,41 @@ - # - # some systems will avoid repeating the line number: - # - # @@ -37 +41,43 @@ - # @@ -37,39 +41 @@ - # @@ -37 +41 @@ - # - # so we need to canonise the output to avoid false negative - # test failures. - - # TODO: Package.get_diff should return a consistent format - # (regardless of the used python version) - def __canonise_diff(diff): - # we cannot use re.M because python 2.6's re.sub does - # not support a flags argument - diff = [re.sub('^@@ -(\d+) ', '@@ -\\1,\\1 ', line) - for line in diff.split('\n')] - diff = [re.sub('^(@@ -\d+,\d+) \+(\d+) ', '\\1 +\\2,\\2 ', line) - for line in diff] - return '\n'.join(diff) - - got = __canonise_diff(got) - exp = __canonise_diff(exp) - self.assertEqualMultiline(got, exp) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_init_package.py b/tests/test_init_package.py deleted file mode 100644 index 7347506..0000000 --- a/tests/test_init_package.py +++ /dev/null @@ -1,88 +0,0 @@ -import osc.core -import osc.oscerr -import os -from common import OscTestCase -FIXTURES_DIR = os.path.join(os.getcwd(), 'init_package_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestInitPackage) - -class TestInitPackage(OscTestCase): - def _get_fixtures_dir(self): - # workaround for git because it doesn't allow empty dirs - if not os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')): - os.mkdir(os.path.join(FIXTURES_DIR, 'osctest')) - return FIXTURES_DIR - - def tearDown(self): - if os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')): - os.rmdir(os.path.join(FIXTURES_DIR, 'osctest')) - OscTestCase.tearDown(self) - - def test_simple(self): - """initialize a package dir""" - pac_dir = os.path.join(self.tmpdir, 'testpkg') - osc.core.Package.init_package('http://localhost', 'osctest', 'testpkg', pac_dir) - storedir = os.path.join(pac_dir, osc.core.store) - self.assertFalse(os.path.exists(os.path.join(storedir, '_meta_mode'))) - self.assertFalse(os.path.exists(os.path.join(storedir, '_size_limit'))) - self._check_list(os.path.join(storedir, '_project'), 'osctest\n') - self._check_list(os.path.join(storedir, '_package'), 'testpkg\n') - self._check_list(os.path.join(storedir, '_files'), '<directory />\n') - self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n') - - def test_size_limit(self): - """initialize a package dir with size_limit parameter""" - pac_dir = os.path.join(self.tmpdir, 'testpkg') - osc.core.Package.init_package('http://localhost', 'osctest', 'testpkg', pac_dir, size_limit=42) - storedir = os.path.join(pac_dir, osc.core.store) - self.assertFalse(os.path.exists(os.path.join(storedir, '_meta_mode'))) - self._check_list(os.path.join(storedir, '_size_limit'), '42\n') - self._check_list(os.path.join(storedir, '_project'), 'osctest\n') - self._check_list(os.path.join(storedir, '_package'), 'testpkg\n') - self._check_list(os.path.join(storedir, '_files'), '<directory />\n') - self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n') - - def test_meta_mode(self): - """initialize a package dir with meta paramter""" - pac_dir = os.path.join(self.tmpdir, 'testpkg') - osc.core.Package.init_package('http://localhost', 'osctest', 'testpkg', pac_dir, meta=True) - storedir = os.path.join(pac_dir, osc.core.store) - self.assertFalse(os.path.exists(os.path.join(storedir, '_size_limit'))) - self._check_list(os.path.join(storedir, '_meta_mode'), '') - self._check_list(os.path.join(storedir, '_project'), 'osctest\n') - self._check_list(os.path.join(storedir, '_package'), 'testpkg\n') - self._check_list(os.path.join(storedir, '_files'), '<directory />\n') - self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n') - - def test_dirExists(self): - """initialize a package dir (dir already exists)""" - pac_dir = os.path.join(self.tmpdir, 'testpkg') - os.mkdir(pac_dir) - osc.core.Package.init_package('http://localhost', 'osctest', 'testpkg', pac_dir) - storedir = os.path.join(pac_dir, osc.core.store) - self.assertFalse(os.path.exists(os.path.join(storedir, '_meta_mode'))) - self.assertFalse(os.path.exists(os.path.join(storedir, '_size_limit'))) - self._check_list(os.path.join(storedir, '_project'), 'osctest\n') - self._check_list(os.path.join(storedir, '_package'), 'testpkg\n') - self._check_list(os.path.join(storedir, '_files'), '<directory />\n') - self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n') - - def test_storedirExists(self): - """initialize a package dir (dir+storedir already exists)""" - pac_dir = os.path.join(self.tmpdir, 'testpkg') - os.mkdir(pac_dir) - os.mkdir(os.path.join(pac_dir, osc.core.store)) - self.assertRaises(osc.oscerr.OscIOError, osc.core.Package.init_package, 'http://localhost', 'osctest', 'testpkg', pac_dir) - - def test_dirIsFile(self): - """initialize a package dir (dir is a file)""" - pac_dir = os.path.join(self.tmpdir, 'testpkg') - os.mkdir(pac_dir) - open(os.path.join(pac_dir, osc.core.store), 'w').write('foo\n') - self.assertRaises(osc.oscerr.OscIOError, osc.core.Package.init_package, 'http://localhost', 'osctest', 'testpkg', pac_dir) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_init_project.py b/tests/test_init_project.py deleted file mode 100644 index f4714dc..0000000 --- a/tests/test_init_project.py +++ /dev/null @@ -1,71 +0,0 @@ -import osc.core -import osc.oscerr -import os -from common import GET, OscTestCase -FIXTURES_DIR = os.path.join(os.getcwd(), 'init_project_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestInitProject) - -class TestInitProject(OscTestCase): - def _get_fixtures_dir(self): - # workaround for git because it doesn't allow empty dirs - if not os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')): - os.mkdir(os.path.join(FIXTURES_DIR, 'osctest')) - return FIXTURES_DIR - - def tearDown(self): - if os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')): - os.rmdir(os.path.join(FIXTURES_DIR, 'osctest')) - OscTestCase.tearDown(self) - - def test_simple(self): - """initialize a project dir""" - prj_dir = os.path.join(self.tmpdir, 'testprj') - prj = osc.core.Project.init_project('http://localhost', prj_dir, 'testprj', getPackageList=False) - self.assertTrue(isinstance(prj, osc.core.Project)) - storedir = os.path.join(prj_dir, osc.core.store) - self._check_list(os.path.join(storedir, '_project'), 'testprj\n') - self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n') - self._check_list(os.path.join(storedir, '_packages'), '<project name="testprj" />') - - def test_dirExists(self): - """initialize a project dir but the dir already exists""" - prj_dir = os.path.join(self.tmpdir, 'testprj') - os.mkdir(prj_dir) - prj = osc.core.Project.init_project('http://localhost', prj_dir, 'testprj', getPackageList=False) - self.assertTrue(isinstance(prj, osc.core.Project)) - storedir = os.path.join(prj_dir, osc.core.store) - self._check_list(os.path.join(storedir, '_project'), 'testprj\n') - self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n') - self._check_list(os.path.join(storedir, '_packages'), '<project name="testprj" />') - - def test_storedirExists(self): - """initialize a project dir but the storedir already exists""" - prj_dir = os.path.join(self.tmpdir, 'testprj') - os.mkdir(prj_dir) - os.mkdir(os.path.join(prj_dir, osc.core.store)) - self.assertRaises(osc.oscerr.OscIOError, osc.core.Project.init_project, 'http://localhost', prj_dir, 'testprj') - - @GET('http://localhost/source/testprj', text='<directory count="0" />') - def test_no_package_tracking(self): - """initialize a project dir but disable package tracking; enable getPackageList=True; - disable wc_check (because we didn't disable the package tracking before the Project class - was imported therefore REQ_STOREFILES contains '_packages') - """ - import osc.conf - # disable package tracking - osc.conf.config['do_package_tracking'] = False - prj_dir = os.path.join(self.tmpdir, 'testprj') - os.mkdir(prj_dir) - prj = osc.core.Project.init_project('http://localhost', prj_dir, 'testprj', False, wc_check=False) - self.assertTrue(isinstance(prj, osc.core.Project)) - storedir = os.path.join(prj_dir, osc.core.store) - self._check_list(os.path.join(storedir, '_project'), 'testprj\n') - self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n') - self.assertFalse(os.path.exists(os.path.join(storedir, '_packages'))) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_package_status.py b/tests/test_package_status.py deleted file mode 100644 index 430adec..0000000 --- a/tests/test_package_status.py +++ /dev/null @@ -1,86 +0,0 @@ -import osc.core -import osc.oscerr -import os -from common import OscTestCase - -FIXTURES_DIR = os.path.join(os.getcwd(), 'project_package_status_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestPackageStatus) - -class TestPackageStatus(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def test_allfiles(self): - """get the status of all files in the wc""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - exp_st = [('A', 'add'), ('?', 'exists'), ('D', 'foo'), ('!', 'merge'), ('R', 'missing'), - ('!', 'missing_added'), ('M', 'nochange'), ('S', 'skipped'), (' ', 'test')] - st = p.get_status() - self.assertEqual(exp_st, st) - - def test_todo(self): - """ - get the status of some files in the wc. - """ - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['test', 'missing_added', 'foo'] - exp_st = [('D', 'foo'), ('!', 'missing_added')] - st = p.get_status(False, ' ') - self.assertEqual(exp_st, st) - - def test_todo_noexcl(self): - """ get the status of some files in the wc. """ - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['test', 'missing_added', 'foo'] - exp_st = [('D', 'foo'), ('!', 'missing_added'), (' ', 'test')] - st = p.get_status() - self.assertEqual(exp_st, st) - - def test_exclude_state(self): - """get the status of all files in the wc but exclude some states""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - exp_st = [('A', 'add'), ('?', 'exists'), ('D', 'foo')] - st = p.get_status(False, '!', 'S', ' ', 'M', 'R') - self.assertEqual(exp_st, st) - - def test_nonexistent(self): - """get the status of a non existent file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.todo = ['doesnotexist'] - self.assertRaises(osc.oscerr.OscIOError, p.get_status) - - def test_conflict(self): - """get status of the wc (one file in conflict state)""" - self._change_to_pkg('conflict') - p = osc.core.Package('.') - exp_st = [('C', 'conflict'), ('?', 'exists'), (' ', 'test')] - st = p.get_status() - self.assertEqual(exp_st, st) - - def test_excluded(self): - """get status of the wc (ignore excluded files); package has state ' '""" - self._change_to_pkg('excluded') - p = osc.core.Package('.') - exp_st = [('?', 'exists'), ('M', 'modified')] - st = p.get_status(False, ' ') - self.assertEqual(exp_st, st) - - def test_noexcluded(self): - """get status of the wc (include excluded files)""" - self._change_to_pkg('excluded') - p = osc.core.Package('.') - exp_st = [('?', '_linkerror'), ('?', 'exists'), ('?', 'foo.orig'), ('M', 'modified'), (' ', 'test')] - st = p.get_status(True) - self.assertEqual(exp_st, st) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_prdiff.py b/tests/test_prdiff.py deleted file mode 100644 index 22e4a7a..0000000 --- a/tests/test_prdiff.py +++ /dev/null @@ -1,272 +0,0 @@ -import osc.commandline -import osc.core -import osc.oscerr -import os -import re -import sys -import urllib2 -from common import GET, POST, OscTestCase, addExpectedRequest, EXPECTED_REQUESTS - - -FIXTURES_DIR = os.path.join(os.getcwd(), 'prdiff_fixtures') -API_URL = 'http://localhost/' -UPSTREAM = 'some:project' -BRANCH = 'home:user:branches:' + UPSTREAM - -def rdiff_url(pkg, oldprj, newprj): - return API_URL + 'source/%s/%s?unified=1&opackage=%s&oproject=%s&cmd=diff&expand=1&filelimit=0' % \ - (newprj, pkg, pkg, oldprj.replace(':', '%3A')) - -def request_url(prj): - return API_URL + 'search/request?match=%%28state%%2F%%40name%%3D%%27new%%27+or+state%%2F%%40name%%3D%%27review%%27%%29+and+%%28action%%2Ftarget%%2F%%40project%%3D%%27%s%%27+or+submit%%2Ftarget%%2F%%40project%%3D%%27%s%%27+or+action%%2Fsource%%2F%%40project%%3D%%27%s%%27+or+submit%%2Fsource%%2F%%40project%%3D%%27%s%%27%%29' % \ - tuple([prj.replace(':', '%3A')] * 4) - -def GET_PROJECT_PACKAGES(*projects): - def decorator(test_method): - def wrapped_test_method(*args): - for project in projects: - addExpectedRequest('GET', API_URL + 'source/' + project, - file='%s/directory' % project) - test_method(*args) - # "rename" method otherwise we cannot specify a TestCaseClass.testName - # cmdline arg when using unittest.main() - wrapped_test_method.__name__ = test_method.__name__ - return wrapped_test_method - return decorator - -def POST_RDIFF(oldprj, newprj): - def decorator(test_method): - def wrapped_test_method(*args): - addExpectedRequest('POST', rdiff_url('common-one', oldprj, newprj), exp='', text='') - addExpectedRequest('POST', rdiff_url('common-two', oldprj, newprj), exp='', file='common-two-diff') - addExpectedRequest('POST', rdiff_url('common-three', oldprj, newprj), exp='', text='') - test_method(*args) - # "rename" method otherwise we cannot specify a TestCaseClass.testName - # cmdline arg when using unittest.main() - wrapped_test_method.__name__ = test_method.__name__ - return wrapped_test_method - return decorator - -def suite(): - import unittest - return unittest.makeSuite(TestProjectDiff) - -class TestProjectDiff(OscTestCase): - diff_hdr = 'Index: %s\n===================================================================' - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def _change_to_tmpdir(self, *args): - os.chdir(os.path.join(self.tmpdir, *args)) - - def _run_prdiff(self, *args): - """Runs osc prdiff, returning captured STDOUT as a string.""" - cli = osc.commandline.Osc() - argv = ['osc', '--no-keyring', '--no-gnome-keyring', 'prdiff'] - argv.extend(args) - cli.main(argv=argv) - return sys.stdout.getvalue() - - - def testPrdiffTooManyArgs(self): - def runner(): - self._run_prdiff('one', 'two', 'superfluous-arg') - self.assertRaises(osc.oscerr.WrongArgs, runner) - - - @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH) - @POST_RDIFF(UPSTREAM, BRANCH) - @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='') - def testPrdiffZeroArgs(self): - exp = """identical: common-one -differs: common-two -identical: common-three -identical: only-in-new -""" - def runner(): - self._run_prdiff() - - os.chdir('/tmp') - self.assertRaises(osc.oscerr.WrongArgs, runner) - - self._change_to_tmpdir(FIXTURES_DIR, UPSTREAM) - self.assertRaises(osc.oscerr.WrongArgs, runner) - - self._change_to_tmpdir(FIXTURES_DIR, BRANCH) - out = self._run_prdiff() - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH) - @POST_RDIFF(UPSTREAM, BRANCH) - @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='') - def testPrdiffOneArg(self): - self._change_to_tmpdir() - exp = """identical: common-one -differs: common-two -identical: common-three -identical: only-in-new -""" - out = self._run_prdiff('home:user:branches:some:project') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES('old:prj', 'new:prj') - @POST_RDIFF('old:prj', 'new:prj') - def testPrdiffTwoArgs(self): - self._change_to_tmpdir() - exp = """identical: common-one -differs: common-two -identical: common-three -""" - out = self._run_prdiff('old:prj', 'new:prj') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES('old:prj', 'new:prj') - @POST_RDIFF('old:prj', 'new:prj') - def testPrdiffOldOnly(self): - self._change_to_tmpdir() - exp = """identical: common-one -differs: common-two -identical: common-three -old only: only-in-old -""" - out = self._run_prdiff('--show-not-in-new', 'old:prj', 'new:prj') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES('old:prj', 'new:prj') - @POST_RDIFF('old:prj', 'new:prj') - def testPrdiffNewOnly(self): - self._change_to_tmpdir() - exp = """identical: common-one -differs: common-two -identical: common-three -new only: only-in-new -""" - out = self._run_prdiff('--show-not-in-old', 'old:prj', 'new:prj') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES('old:prj', 'new:prj') - @POST_RDIFF('old:prj', 'new:prj') - def testPrdiffDiffstat(self): - self._change_to_tmpdir() - exp = """identical: common-one -differs: common-two - - common-two | 1 + - 1 file changed, 1 insertion(+) - -identical: common-three -""" - out = self._run_prdiff('--diffstat', 'old:prj', 'new:prj') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES('old:prj', 'new:prj') - @POST_RDIFF('old:prj', 'new:prj') - def testPrdiffUnified(self): - self._change_to_tmpdir() - exp = """identical: common-one -differs: common-two - -Index: common-two -=================================================================== ---- common-two\t2013-01-18 19:18:38.225983117 +0000 -+++ common-two\t2013-01-18 19:19:27.882082325 +0000 -@@ -1,4 +1,5 @@ - line one - line two - line three -+an extra line - last line - -identical: common-three -""" - out = self._run_prdiff('--unified', 'old:prj', 'new:prj') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES('old:prj', 'new:prj') - @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff') - @POST(rdiff_url('common-three', 'old:prj', 'new:prj'), exp='', text='') - def testPrdiffInclude(self): - self._change_to_tmpdir() - exp = """differs: common-two -identical: common-three -""" - out = self._run_prdiff('--include', 'common-t', - 'old:prj', 'new:prj') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES('old:prj', 'new:prj') - @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff') - @POST(rdiff_url('common-three', 'old:prj', 'new:prj'), exp='', text='') - def testPrdiffExclude(self): - self._change_to_tmpdir() - exp = """differs: common-two -identical: common-three -""" - out = self._run_prdiff('--exclude', 'one', 'old:prj', 'new:prj') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES('old:prj', 'new:prj') - @POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff') - def testPrdiffIncludeExclude(self): - self._change_to_tmpdir() - exp = """differs: common-two -""" - out = self._run_prdiff('--include', 'common-t', - '--exclude', 'three', - 'old:prj', 'new:prj') - self.assertEqualMultiline(out, exp) - - - @GET_PROJECT_PACKAGES(UPSTREAM, BRANCH) - @GET(request_url(UPSTREAM), exp='', file='request') - @POST(rdiff_url('common-one', UPSTREAM, BRANCH), exp='', text='') - @POST(rdiff_url('common-two', UPSTREAM, BRANCH), exp='', file='common-two-diff') - @POST(rdiff_url('common-three', UPSTREAM, BRANCH), exp='', file='common-two-diff') - @POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='') - def testPrdiffRequestsMatching(self): - self._change_to_tmpdir() - exp = """identical: common-one -differs: common-two - -148023 State:new By:user When:2013-01-11T11:04:14 - submit: home:user:branches:some:project/common-two -> some:project - Descr: - Fix it to work - Improve support for something - -differs: common-three -identical: only-in-new -""" - out = self._run_prdiff('--requests', UPSTREAM, BRANCH) - self.assertEqualMultiline(out, exp) - - - # Reverse the direction of the diff. - @GET_PROJECT_PACKAGES(BRANCH, UPSTREAM) - @GET(request_url(BRANCH), exp='', file='no-requests') - @POST(rdiff_url('common-one', BRANCH, UPSTREAM), exp='', text='') - @POST(rdiff_url('common-two', BRANCH, UPSTREAM), exp='', file='common-two-diff') - @POST(rdiff_url('common-three', BRANCH, UPSTREAM), exp='', file='common-two-diff') - @POST(rdiff_url('only-in-new', BRANCH, UPSTREAM), exp='', text='') - def testPrdiffRequestsSwitched(self): - self._change_to_tmpdir() - exp = """identical: common-one -differs: common-two -differs: common-three -identical: only-in-new -""" - out = self._run_prdiff('--requests', BRANCH, UPSTREAM) - self.assertEqualMultiline(out, exp) - - - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_project_status.py b/tests/test_project_status.py deleted file mode 100644 index 3c8497f..0000000 --- a/tests/test_project_status.py +++ /dev/null @@ -1,161 +0,0 @@ -import osc.core -import osc.oscerr -import os -from common import OscTestCase - -FIXTURES_DIR = os.path.join(os.getcwd(), 'project_package_status_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestProjectStatus) - -class TestProjectStatus(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def test_simple(self): - """get the status of a package with state ' '""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = ' ' - st = prj.status('simple') - self.assertEqual(exp_st, st) - - def test_added(self): - """get the status of an added package""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = 'A' - st = prj.status('added') - self.assertEqual(exp_st, st) - - def test_deleted(self): - """get the status of a deleted package""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = 'D' - st = prj.status('deleted') - self.assertEqual(exp_st, st) - - def test_added_deleted(self): - """ - get the status of a package which was added and deleted - afterwards (with a non osc command) - """ - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = '!' - st = prj.status('added_deleted') - self.assertEqual(exp_st, st) - - def test_missing(self): - """ - get the status of a package with state " " - which was removed by a non osc command - """ - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = '!' - st = prj.status('missing') - self.assertEqual(exp_st, st) - - def test_deleted_deleted(self): - """ - get the status of a package which was deleted (with an - osc command) and afterwards the package directory was - deleted with a non osc command - """ - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = 'D' - st = prj.status('deleted_deleted') - self.assertEqual(exp_st, st) - - def test_unversioned_exists(self): - """get the status of an unversioned package""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = '?' - st = prj.status('excluded') - self.assertEqual(exp_st, st) - - def test_unversioned_nonexistent(self): - """get the status of an unversioned, nonexistent package""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - self.assertRaises(osc.oscerr.OscIOError, prj.status, 'doesnotexist') - - def test_get_status(self): - """get the status of the complete project""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = [(' ', 'conflict'), (' ', 'simple'), ('A', 'added'), ('D', 'deleted'), - ('!', 'missing'), ('!', 'added_deleted'), ('D', 'deleted_deleted'), ('?', 'excluded')] - st = prj.get_status() - self.assertEqual(exp_st, st) - - def test_get_status_excl(self): - """get the status of the complete project (exclude some states)""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - exp_st = [('A', 'added'), ('!', 'missing'), ('!', 'added_deleted')] - st = prj.get_status('D', ' ', '?') - self.assertEqual(exp_st, st) - - def test_get_pacobj_simple(self): - """package exists""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - p = prj.get_pacobj('simple') - self.assertTrue(isinstance(p, osc.core.Package)) - self.assertEqual(p.name, 'simple') - - def test_get_pacobj_added(self): - """package has state 'A', also test pac_kwargs""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - p = prj.get_pacobj('added', progress_obj={}) - self.assertTrue(isinstance(p, osc.core.Package)) - self.assertEqual(p.name, 'added') - self.assertEqual(p.progress_obj, {}) - - def test_get_pacobj_deleted(self): - """package has state 'D' and exists, also test pac_args""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - p = prj.get_pacobj('deleted', {}) - self.assertTrue(isinstance(p, osc.core.Package)) - self.assertEqual(p.name, 'deleted') - self.assertEqual(p.progress_obj, {}) - - def test_get_pacobj_missing(self): - """package is missing""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - p = prj.get_pacobj('missing') - self.assertTrue(isinstance(p, type(None))) - - def test_get_pacobj_deleted_deleted(self): - """package has state 'D' and does not exist""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - p = prj.get_pacobj('deleted_deleted') - self.assertTrue(isinstance(p, type(None))) - - def test_get_pacobj_unversioned(self): - """package/dir has state '?'""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - p = prj.get_pacobj('excluded') - self.assertTrue(isinstance(p, type(None))) - - def test_get_pacobj_nonexistent(self): - """package/dir does not exist""" - self._change_to_pkg('.') - prj = osc.core.Project('.', getPackageList=False) - p = prj.get_pacobj('doesnotexist') - self.assertTrue(isinstance(p, type(None))) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_repairwc.py b/tests/test_repairwc.py deleted file mode 100644 index c239da7..0000000 --- a/tests/test_repairwc.py +++ /dev/null @@ -1,259 +0,0 @@ -import osc.core -import osc.oscerr -import os -import sys -from common import GET, PUT, POST, DELETE, OscTestCase -from xml.etree import cElementTree as ET -FIXTURES_DIR = os.path.join(os.getcwd(), 'repairwc_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestRepairWC) - -class TestRepairWC(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def __assertNotRaises(self, exception, meth, *args, **kwargs): - try: - meth(*args, **kwargs) - except exception: - self.fail('%s raised' % exception.__name__) - - def test_working_empty(self): - """consistent, empty working copy""" - self._change_to_pkg('working_empty') - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_working_nonempty(self): - """ - consistent, non-empty working copy. One file is in conflict, - one file is marked for deletion and one file has state 'A' - """ - self._change_to_pkg('working_nonempty') - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_buildfiles(self): - """ - wc has a _buildconfig_prj_arch and a _buildinfo_prj_arch.xml in the storedir - """ - self._change_to_pkg('buildfiles') - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - @GET('http://localhost/source/osctest/simple1/foo?rev=1', text='This is a simple test.\n') - def test_simple1(self): - """a file is marked for deletion but storefile doesn't exist""" - self._change_to_pkg('simple1') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - p.wc_repair() - self.assertTrue(os.path.exists(os.path.join('.osc', 'foo'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - self._check_status(p, 'nochange', 'M') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'toadd1', '?') - # additional cleanup check - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_simple2(self): - """a file "somefile" exists in the storedir which isn't tracked""" - self._change_to_pkg('simple2') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - p.wc_repair() - self.assertFalse(os.path.exists(os.path.join('.osc', 'somefile'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - self._check_status(p, 'nochange', 'M') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'toadd1', '?') - # additional cleanup check - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_simple3(self): - """toadd1 has state 'A' and a file .osc/toadd1 exists""" - self._change_to_pkg('simple3') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - p.wc_repair() - self.assertFalse(os.path.exists(os.path.join('.osc', 'toadd1'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - self._check_status(p, 'nochange', 'M') - self._check_status(p, 'merge', ' ') - self._check_addlist('toadd1\n') - self._check_status(p, 'toadd1', 'A') - # additional cleanup check - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_simple4(self): - """a file is listed in _to_be_deleted but isn't present in _files""" - self._change_to_pkg('simple4') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - p.wc_repair() - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - self._check_status(p, 'nochange', 'M') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'toadd1', '?') - # additional cleanup check - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_simple5(self): - """a file is listed in _in_conflict but isn't present in _files""" - self._change_to_pkg('simple5') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - p.wc_repair() - self.assertFalse(os.path.exists(os.path.join('.osc', '_in_conflict'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - self._check_status(p, 'nochange', 'M') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'toadd1', '?') - # additional cleanup check - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - @GET('http://localhost/source/osctest/simple6/foo?rev=1', text='This is a simple test.\n') - def test_simple6(self): - """ - a file is listed in _to_be_deleted and is present - in _files but the storefile is missing - """ - self._change_to_pkg('simple6') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - p.wc_repair() - self.assertTrue(os.path.exists(os.path.join('.osc', 'foo'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - self._check_status(p, 'nochange', 'M') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'toadd1', '?') - # additional cleanup check - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_simple7(self): - """files marked as skipped don't exist in the storedir""" - self._change_to_pkg('simple7') - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_simple8(self): - """ - a file is marked as skipped but the skipped file exists in the storedir - """ - self._change_to_pkg('simple8') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - p.wc_repair() - self.assertFalse(os.path.exists(os.path.join('.osc', 'skipped'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - self._check_status(p, 'nochange', 'M') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'toadd1', '?') - self._check_status(p, 'skipped', 'S') - # additional cleanup check - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - @GET('http://localhost/source/osctest/multiple/merge?rev=1', text='Is it\npossible to\nmerge this file?I hope so...\n') - @GET('http://localhost/source/osctest/multiple/nochange?rev=1', text='This file didn\'t change.\n') - def test_multiple(self): - """ - a storefile is missing, a file is listed in _to_be_deleted - but is not present in _files, a file is listed in _in_conflict - but the storefile is missing and a file exists in the storedir - but is not present in _files - """ - self._change_to_pkg('multiple') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - p.wc_repair() - self.assertTrue(os.path.exists(os.path.join('.osc', 'foo'))) - self.assertFalse(os.path.exists(os.path.join('.osc', 'unknown_file'))) - self._check_deletelist('foo\n') - self._check_status(p, 'foo', 'D') - self._check_status(p, 'nochange', 'C') - self._check_status(p, 'merge', ' ') - self._check_status(p, 'foobar', 'A') - self._check_status(p, 'toadd1', '?') - # additional cleanup check - self.__assertNotRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - - def test_noapiurl(self): - """the package wc has no _apiurl file""" - self._change_to_pkg('noapiurl') - p = osc.core.Package('.', wc_check=False) - p.wc_repair('http://localhost') - self.assertTrue(os.path.exists(os.path.join('.osc', '_apiurl'))) - self.assertEqual(open(os.path.join('.osc', '_apiurl')).read(), 'http://localhost\n') - self.assertEqual(p.apiurl, 'http://localhost') - - def test_invalidapiurl(self): - """the package wc has an invalid apiurl file (invalid url format)""" - self._change_to_pkg('invalid_apiurl') - p = osc.core.Package('.', wc_check=False) - p.wc_repair('http://localhost') - self.assertTrue(os.path.exists(os.path.join('.osc', '_apiurl'))) - self.assertEqual(open(os.path.join('.osc', '_apiurl')).read(), 'http://localhost\n') - self.assertEqual(p.apiurl, 'http://localhost') - - def test_invalidapiurl_param(self): - """pass an invalid apiurl to wc_repair""" - import urllib2 - self._change_to_pkg('invalid_apiurl') - p = osc.core.Package('.', wc_check=False) - self.assertRaises(urllib2.URLError, p.wc_repair, 'http:/localhost') - self.assertRaises(urllib2.URLError, p.wc_repair, 'invalid') - - def test_noapiurlNotExistingApiurl(self): - """the package wc has no _apiurl file and no apiurl is passed to repairwc""" - self._change_to_pkg('noapiurl') - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Package, '.') - p = osc.core.Package('.', wc_check=False) - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, p.wc_repair) - self.assertFalse(os.path.exists(os.path.join('.osc', '_apiurl'))) - - def test_project_noapiurl(self): - """the project wc has no _apiurl file""" - import shutil - prj_dir = os.path.join(self.tmpdir, 'prj_noapiurl') - shutil.copytree(os.path.join(self._get_fixtures_dir(), 'prj_noapiurl'), prj_dir) - storedir = os.path.join(prj_dir, osc.core.store) - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Project, prj_dir, getPackageList=False) - prj = osc.core.Project(prj_dir, wc_check=False, getPackageList=False) - prj.wc_repair('http://localhost') - self.assertTrue(os.path.exists(os.path.join(storedir, '_apiurl'))) - self.assertTrue(os.path.exists(os.path.join(storedir, '_apiurl'))) - self.assertEqual(open(os.path.join(storedir, '_apiurl'), 'r').read(), 'http://localhost\n') - - def test_project_invalidapiurl(self): - """the project wc has an invalid _apiurl file (invalid url format)""" - import shutil - prj_dir = os.path.join(self.tmpdir, 'prj_invalidapiurl') - shutil.copytree(os.path.join(self._get_fixtures_dir(), 'prj_invalidapiurl'), prj_dir) - storedir = os.path.join(prj_dir, osc.core.store) - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Project, prj_dir, getPackageList=False) - prj = osc.core.Project(prj_dir, wc_check=False, getPackageList=False) - prj.wc_repair('http://localhost') - self.assertTrue(os.path.exists(os.path.join(storedir, '_apiurl'))) - self.assertTrue(os.path.exists(os.path.join(storedir, '_apiurl'))) - self.assertEqual(open(os.path.join(storedir, '_apiurl'), 'r').read(), 'http://localhost\n') - - def test_project_invalidapiurl_param(self): - """pass an invalid apiurl to wc_repair""" - import shutil - import urllib2 - prj_dir = os.path.join(self.tmpdir, 'prj_invalidapiurl') - shutil.copytree(os.path.join(self._get_fixtures_dir(), 'prj_invalidapiurl'), prj_dir) - storedir = os.path.join(prj_dir, osc.core.store) - self.assertRaises(osc.oscerr.WorkingCopyInconsistent, osc.core.Project, prj_dir, getPackageList=False) - prj = osc.core.Project(prj_dir, wc_check=False, getPackageList=False) - self.assertRaises(urllib2.URLError, prj.wc_repair, 'http:/localhost') - self.assertRaises(urllib2.URLError, prj.wc_repair, 'invalid') - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_request.py b/tests/test_request.py deleted file mode 100644 index 832b587..0000000 --- a/tests/test_request.py +++ /dev/null @@ -1,577 +0,0 @@ -import osc.core -import osc.oscerr -import os -from common import OscTestCase - -FIXTURES_DIR = os.path.join(os.getcwd(), 'request_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestRequest) - -class TestRequest(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def setUp(self): - OscTestCase.setUp(self, copytree=False) - - def test_createsr(self): - """create a simple submitrequest""" - r = osc.core.Request() - r.add_action('submit', src_project='foo', src_package='bar', src_rev='42', - tgt_project='foobar', tgt_package='bar') - self.assertEqual(r.actions[0].type, 'submit') - self.assertEqual(r.actions[0].src_project, 'foo') - self.assertEqual(r.actions[0].src_package, 'bar') - self.assertEqual(r.actions[0].src_rev, '42') - self.assertEqual(r.actions[0].tgt_project, 'foobar') - self.assertEqual(r.actions[0].tgt_package, 'bar') - self.assertTrue(r.actions[0].opt_sourceupdate is None) - self.assertTrue(r.actions[0].opt_updatelink is None) - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - self.assertRaises(AttributeError, getattr, r.actions[0], 'doesnotexist') - exp = """<request> - <action type="submit"> - <source package="bar" project="foo" rev="42" /> - <target package="bar" project="foobar" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_createsr_with_option(self): - """create a submitrequest with option""" - """create a simple submitrequest""" - r = osc.core.Request() - r.add_action('submit', src_project='foo', src_package='bar', - tgt_project='foobar', tgt_package='bar', opt_sourceupdate='cleanup', opt_updatelink='1') - self.assertEqual(r.actions[0].type, 'submit') - self.assertEqual(r.actions[0].src_project, 'foo') - self.assertEqual(r.actions[0].src_package, 'bar') - self.assertEqual(r.actions[0].tgt_project, 'foobar') - self.assertEqual(r.actions[0].tgt_package, 'bar') - self.assertEqual(r.actions[0].opt_sourceupdate, 'cleanup') - self.assertEqual(r.actions[0].opt_updatelink, '1') - self.assertTrue(r.actions[0].src_rev is None) - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - self.assertRaises(AttributeError, getattr, r.actions[0], 'doesnotexist') - exp = """<request> - <action type="submit"> - <source package="bar" project="foo" /> - <target package="bar" project="foobar" /> - <options> - <sourceupdate>cleanup</sourceupdate> - <updatelink>1</updatelink> - </options> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_createsr_missing_tgt_package(self): - """create a submitrequest with missing target package""" - r = osc.core.Request() - r.add_action('submit', src_project='foo', src_package='bar', - tgt_project='foobar') - self.assertEqual(r.actions[0].type, 'submit') - self.assertEqual(r.actions[0].src_project, 'foo') - self.assertEqual(r.actions[0].src_package, 'bar') - self.assertEqual(r.actions[0].tgt_project, 'foobar') - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - self.assertTrue(r.actions[0].tgt_package is None) - self.assertRaises(AttributeError, getattr, r.actions[0], 'doesnotexist') - exp = """<request> - <action type="submit"> - <source package="bar" project="foo" /> - <target project="foobar" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_createsr_invalid_argument(self): - """create a submitrequest with invalid action argument""" - r = osc.core.Request() - self.assertRaises(osc.oscerr.WrongArgs, r.add_action, 'submit', src_project='foo', src_invalid='bar') - - def test_create_request_invalid_type(self): - """create a request with an invalid action type""" - r = osc.core.Request() - self.assertRaises(osc.oscerr.WrongArgs, r.add_action, 'invalid', foo='bar') - - def test_create_add_role_person(self): - """create an add_role request (person element)""" - r = osc.core.Request() - r.add_action('add_role', tgt_project='foo', tgt_package='bar', person_name='user', person_role='reader') - self.assertEqual(r.actions[0].type, 'add_role') - self.assertEqual(r.actions[0].tgt_project, 'foo') - self.assertEqual(r.actions[0].tgt_package, 'bar') - self.assertEqual(r.actions[0].person_name, 'user') - self.assertEqual(r.actions[0].person_role, 'reader') - self.assertTrue(r.actions[0].group_name is None) - self.assertTrue(r.actions[0].group_role is None) - exp = """<request> - <action type="add_role"> - <target package="bar" project="foo" /> - <person name="user" role="reader" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_create_add_role_group(self): - """create an add_role request (group element)""" - r = osc.core.Request() - r.add_action('add_role', tgt_project='foo', tgt_package='bar', group_name='group', group_role='reviewer') - self.assertEqual(r.actions[0].type, 'add_role') - self.assertEqual(r.actions[0].tgt_project, 'foo') - self.assertEqual(r.actions[0].tgt_package, 'bar') - self.assertEqual(r.actions[0].group_name, 'group') - self.assertEqual(r.actions[0].group_role, 'reviewer') - self.assertTrue(r.actions[0].person_name is None) - self.assertTrue(r.actions[0].person_role is None) - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - exp = """<request> - <action type="add_role"> - <target package="bar" project="foo" /> - <group name="group" role="reviewer" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_create_add_role_person_group(self): - """create an add_role request (person+group element)""" - r = osc.core.Request() - r.add_action('add_role', tgt_project='foo', tgt_package='bar', person_name='user', person_role='reader', - group_name='group', group_role='reviewer') - self.assertEqual(r.actions[0].type, 'add_role') - self.assertEqual(r.actions[0].tgt_project, 'foo') - self.assertEqual(r.actions[0].tgt_package, 'bar') - self.assertEqual(r.actions[0].person_name, 'user') - self.assertEqual(r.actions[0].person_role, 'reader') - self.assertEqual(r.actions[0].group_name, 'group') - self.assertEqual(r.actions[0].group_role, 'reviewer') - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - exp = """<request> - <action type="add_role"> - <target package="bar" project="foo" /> - <person name="user" role="reader" /> - <group name="group" role="reviewer" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_create_set_bugowner_project(self): - """create a set_bugowner request for a project""" - r = osc.core.Request() - r.add_action('set_bugowner', tgt_project='foobar', person_name='buguser') - self.assertEqual(r.actions[0].type, 'set_bugowner') - self.assertEqual(r.actions[0].tgt_project, 'foobar') - self.assertEqual(r.actions[0].person_name, 'buguser') - self.assertTrue(r.actions[0].tgt_package is None) - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - exp = """<request> - <action type="set_bugowner"> - <target project="foobar" /> - <person name="buguser" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_create_set_bugowner_package(self): - """create a set_bugowner request for a package""" - r = osc.core.Request() - r.add_action('set_bugowner', tgt_project='foobar', tgt_package='baz', person_name='buguser') - self.assertEqual(r.actions[0].type, 'set_bugowner') - self.assertEqual(r.actions[0].tgt_project, 'foobar') - self.assertEqual(r.actions[0].tgt_package, 'baz') - self.assertEqual(r.actions[0].person_name, 'buguser') - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - exp = """<request> - <action type="set_bugowner"> - <target package="baz" project="foobar" /> - <person name="buguser" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_create_delete_project(self): - """create a delete request for a project""" - r = osc.core.Request() - r.add_action('delete', tgt_project='foo') - self.assertEqual(r.actions[0].type, 'delete') - self.assertEqual(r.actions[0].tgt_project, 'foo') - self.assertTrue(r.actions[0].tgt_package is None) - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - exp = """<request> - <action type="delete"> - <target project="foo" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_create_delete_package(self): - """create a delete request for a package""" - r = osc.core.Request() - r.add_action('delete', tgt_project='foo', tgt_package='deleteme') - self.assertEqual(r.actions[0].type, 'delete') - self.assertEqual(r.actions[0].tgt_project, 'foo') - self.assertEqual(r.actions[0].tgt_package, 'deleteme') - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - exp = """<request> - <action type="delete"> - <target package="deleteme" project="foo" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_create_change_devel(self): - """create a change devel request""" - r = osc.core.Request() - r.add_action('change_devel', src_project='foo', src_package='bar', tgt_project='devprj', tgt_package='devpkg') - self.assertEqual(r.actions[0].type, 'change_devel') - self.assertEqual(r.actions[0].src_project, 'foo') - self.assertEqual(r.actions[0].src_package, 'bar') - self.assertEqual(r.actions[0].tgt_project, 'devprj') - self.assertEqual(r.actions[0].tgt_package, 'devpkg') - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - exp = """<request> - <action type="change_devel"> - <source package="bar" project="foo" /> - <target package="devpkg" project="devprj" /> - </action> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_action_from_xml1(self): - """create action from xml""" - from xml.etree import cElementTree as ET - xml = """<action type="add_role"> - <target package="bar" project="foo" /> - <person name="user" role="reader" /> - <group name="group" role="reviewer" /> -</action>""" - action = osc.core.Action.from_xml(ET.fromstring(xml)) - self.assertEqual(action.type, 'add_role') - self.assertEqual(action.tgt_project, 'foo') - self.assertEqual(action.tgt_package, 'bar') - self.assertEqual(action.person_name, 'user') - self.assertEqual(action.person_role, 'reader') - self.assertEqual(action.group_name, 'group') - self.assertEqual(action.group_role, 'reviewer') - self.assertEqual(xml, action.to_str()) - - def test_action_from_xml2(self): - """create action from xml""" - from xml.etree import cElementTree as ET - xml = """<action type="submit"> - <source package="bar" project="foo" /> - <target package="bar" project="foobar" /> - <options> - <sourceupdate>cleanup</sourceupdate> - <updatelink>1</updatelink> - </options> -</action>""" - action = osc.core.Action.from_xml(ET.fromstring(xml)) - self.assertEqual(action.type, 'submit') - self.assertEqual(action.src_project, 'foo') - self.assertEqual(action.src_package, 'bar') - self.assertEqual(action.tgt_project, 'foobar') - self.assertEqual(action.tgt_package, 'bar') - self.assertEqual(action.opt_sourceupdate, 'cleanup') - self.assertEqual(action.opt_updatelink, '1') - self.assertTrue(action.src_rev is None) - self.assertEqual(xml, action.to_str()) - - def test_action_from_xml3(self): - """create action from xml (with acceptinfo element)""" - from xml.etree import cElementTree as ET - xml = """<action type="submit"> - <source package="bar" project="testprj" /> - <target package="baz" project="foobar" /> - <acceptinfo rev="5" srcmd5="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" xsrcmd5="ffffffffffffffffffffffffffffffff" /> -</action>""" - action = osc.core.Action.from_xml(ET.fromstring(xml)) - self.assertEqual(action.type, 'submit') - self.assertEqual(action.src_project, 'testprj') - self.assertEqual(action.src_package, 'bar') - self.assertEqual(action.tgt_project, 'foobar') - self.assertEqual(action.tgt_package, 'baz') - self.assertTrue(action.opt_sourceupdate is None) - self.assertTrue(action.opt_updatelink is None) - self.assertTrue(action.src_rev is None) - self.assertEqual(action.acceptinfo_rev, '5') - self.assertEqual(action.acceptinfo_srcmd5, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') - self.assertEqual(action.acceptinfo_xsrcmd5, 'ffffffffffffffffffffffffffffffff') - self.assertTrue(action.acceptinfo_osrcmd5 is None) - self.assertTrue(action.acceptinfo_oxsrcmd5 is None) - self.assertEqual(xml, action.to_str()) - - def test_action_from_xml_unknown_type(self): - """try to create action from xml with unknown type""" - from xml.etree import cElementTree as ET - xml = '<action type="foo"><source package="bar" project="foo" /></action>' - self.assertRaises(osc.oscerr.WrongArgs, osc.core.Action.from_xml, ET.fromstring(xml)) - - def test_read_request1(self): - """read in a request""" - from xml.etree import cElementTree as ET - xml = open(os.path.join(self._get_fixtures_dir(), 'test_read_request1.xml'), 'r').read().strip() - r = osc.core.Request() - r.read(ET.fromstring(xml)) - self.assertEqual(r.reqid, '42') - self.assertEqual(r.actions[0].type, 'submit') - self.assertEqual(r.actions[0].src_project, 'foo') - self.assertEqual(r.actions[0].src_package, 'bar') - self.assertEqual(r.actions[0].src_rev, '1') - self.assertEqual(r.actions[0].tgt_project, 'foobar') - self.assertEqual(r.actions[0].tgt_package, 'bar') - self.assertTrue(r.actions[0].opt_sourceupdate is None) - self.assertTrue(r.actions[0].opt_updatelink is None) - self.assertEqual(r.actions[1].type, 'delete') - self.assertEqual(r.actions[1].tgt_project, 'deleteme') - self.assertTrue(r.actions[1].tgt_package is None) - self.assertEqual(r.state.name, 'accepted') - self.assertEqual(r.state.when, '2010-12-27T01:36:29') - self.assertEqual(r.state.who, 'user1') - self.assertEqual(r.state.comment, '') - self.assertEqual(r.statehistory[0].name, 'new') - self.assertEqual(r.statehistory[0].when, '2010-12-13T13:02:03') - self.assertEqual(r.statehistory[0].who, 'creator') - self.assertEqual(r.statehistory[0].comment, 'foobar') - self.assertEqual(r.title, 'title of the request') - self.assertEqual(r.description, 'this is a\nvery long\ndescription') - self.assertTrue(len(r.statehistory) == 1) - self.assertTrue(len(r.reviews) == 0) - self.assertEqual(xml, r.to_str()) - - def test_read_request2(self): - """read in a request (with reviews)""" - from xml.etree import cElementTree as ET - xml = open(os.path.join(self._get_fixtures_dir(), 'test_read_request2.xml'), 'r').read().strip() - r = osc.core.Request() - r.read(ET.fromstring(xml)) - self.assertEqual(r.reqid, '123') - self.assertEqual(r.actions[0].type, 'submit') - self.assertEqual(r.actions[0].src_project, 'xyz') - self.assertEqual(r.actions[0].src_package, 'abc') - self.assertTrue(r.actions[0].src_rev is None) - self.assertEqual(r.actions[0].opt_sourceupdate, 'cleanup') - self.assertEqual(r.actions[0].opt_updatelink, '1') - self.assertEqual(r.actions[1].type, 'add_role') - self.assertEqual(r.actions[1].tgt_project, 'home:foo') - self.assertEqual(r.actions[1].person_name, 'bar') - self.assertEqual(r.actions[1].person_role, 'maintainer') - self.assertEqual(r.actions[1].group_name, 'groupxyz') - self.assertEqual(r.actions[1].group_role, 'reader') - self.assertTrue(r.actions[1].tgt_package is None) - self.assertEqual(r.state.name, 'review') - self.assertEqual(r.state.when, '2010-12-27T01:36:29') - self.assertEqual(r.state.who, 'abc') - self.assertEqual(r.state.comment, '') - self.assertEqual(r.reviews[0].state, 'new') - self.assertEqual(r.reviews[0].by_group, 'group1') - self.assertEqual(r.reviews[0].when, '2010-12-28T00:11:22') - self.assertEqual(r.reviews[0].who, 'abc') - self.assertEqual(r.reviews[0].comment, 'review start') - self.assertTrue(r.reviews[0].by_user is None) - self.assertEqual(r.statehistory[0].name, 'new') - self.assertEqual(r.statehistory[0].when, '2010-12-11T00:00:00') - self.assertEqual(r.statehistory[0].who, 'creator') - self.assertEqual(r.statehistory[0].comment, '') - self.assertEqual(r.get_creator(), 'creator') - self.assertTrue(len(r.statehistory) == 1) - self.assertTrue(len(r.reviews) == 1) - self.assertEqual(xml, r.to_str()) - - def test_read_request3(self): - """read in a request (with an "empty" comment+description)""" - from xml.etree import cElementTree as ET - xml = """<request id="2"> - <action type="set_bugowner"> - <target project="foo" /> - <person name="buguser" /> - </action> - <state name="new" when="2010-12-28T12:36:29" who="xyz"> - <comment></comment> - </state> - <description></description> -</request>""" - r = osc.core.Request() - r.read(ET.fromstring(xml)) - self.assertEqual(r.reqid, '2') - self.assertEqual(r.actions[0].type, 'set_bugowner') - self.assertEqual(r.actions[0].tgt_project, 'foo') - self.assertEqual(r.actions[0].person_name, 'buguser') - self.assertEqual(r.state.name, 'new') - self.assertEqual(r.state.when, '2010-12-28T12:36:29') - self.assertEqual(r.state.who, 'xyz') - self.assertEqual(r.state.comment, '') - self.assertEqual(r.description, '') - self.assertTrue(len(r.statehistory) == 0) - self.assertTrue(len(r.reviews) == 0) - self.assertEqual(r.get_creator(), 'xyz') - exp = """<request id="2"> - <action type="set_bugowner"> - <target project="foo" /> - <person name="buguser" /> - </action> - <state name="new" when="2010-12-28T12:36:29" who="xyz" /> -</request>""" - - self.assertEqual(exp, r.to_str()) - - def test_request_list_view1(self): - """test the list_view method""" - from xml.etree import cElementTree as ET - xml = open(os.path.join(self._get_fixtures_dir(), 'test_request_list_view1.xml'), 'r').read().strip() - exp = """\ - 62 State:new By:Admin When:2010-12-29T14:57:25 - set_bugowner: buguser foo - add_role: person: xyz as maintainer, group: group1 as reader foobar - add_role: person: abc as reviewer foo/bar - change_devel: foo/bar developed in devprj/devpkg - submit: srcprj/srcpackage -> tgtprj/tgtpackage - submit: foo/bar -> baz - delete: deleteme - delete: foo/bar\n""" - r = osc.core.Request() - r.read(ET.fromstring(xml)) - self.assertEqual(exp, r.list_view()) - - def test_request_list_view2(self): - """test the list_view method (with history elements and description)""" - from xml.etree import cElementTree as ET - xml = open(os.path.join(self._get_fixtures_dir(), 'test_request_list_view2.xml'), 'r').read().strip() - r = osc.core.Request() - r.read(ET.fromstring(xml)) - exp = """\ - 21 State:accepted By:foobar When:2010-12-29T16:37:45 - set_bugowner: buguser foo - From: new(user) -> review(foobar) - Descr: This is a simple request with a lot of ... ... text and other - stuff. This request also contains a description. This is useful - to describe the request. blabla blabla\n""" - self.assertEqual(exp, r.list_view()) - - def test_request_str1(self): - from xml.etree import cElementTree as ET - """test the __str__ method""" - xml = open(os.path.join(self._get_fixtures_dir(), 'test_request_str1.xml'), 'r').read().strip() - r = osc.core.Request() - r = osc.core.Request() - r.read(ET.fromstring(xml)) - self.assertEqual(r.get_creator(), 'creator') - exp = """\ -Request: #123 - - submit: xyz/abc(cleanup) -> foo - add_role: person: bar as maintainer, group: groupxyz as reader home:foo - - -Message: -just a samll description -in order to describe this -request - blablabla -test. - -State: review 2010-12-27T01:36:29 abc -Comment: currently in review - -Review: accepted Group: group1 2010-12-29T00:11:22 abc accepted - new Group: group1 2010-12-28T00:11:22 abc review start - -History: revoked 2010-12-12T00:00:00 creator - new 2010-12-11T00:00:00 creator""" - self.assertEqual(exp, str(r)) - - def test_request_str2(self): - """test the __str__ method""" - from xml.etree import cElementTree as ET - xml = """\ -<request id="98765"> - <action type="change_devel"> - <source project="devprj" package="devpkg" /> - <target project="foo" package="bar" /> - </action> - <action type="delete"> - <target project="deleteme" /> - </action> - <state name="new" when="2010-12-29T00:11:22" who="creator" /> -</request>""" - r = osc.core.Request() - r.read(ET.fromstring(xml)) - self.assertEqual(r.get_creator(), 'creator') - exp = """\ -Request: #98765 - - change_devel: foo/bar developed in devprj/devpkg - delete: deleteme - - -Message: -<no message> - -State: new 2010-12-29T00:11:22 creator -Comment: <no comment>""" - self.assertEqual(exp, str(r)) - - def test_legacy_request(self): - """load old-style submitrequest""" - from xml.etree import cElementTree as ET - xml = """\ -<request id="1234" type="submit"> - <submit> - <source package="baz" project="foobar" /> - <target package="baz" project="foo" /> - </submit> - <state name="new" when="2010-12-30T02:11:22" who="olduser" /> -</request>""" - r = osc.core.Request() - r.read(ET.fromstring(xml)) - self.assertEqual(r.reqid, '1234') - self.assertEqual(r.actions[0].type, 'submit') - self.assertEqual(r.actions[0].src_project, 'foobar') - self.assertEqual(r.actions[0].src_package, 'baz') - self.assertEqual(r.actions[0].tgt_project, 'foo') - self.assertEqual(r.actions[0].tgt_package, 'baz') - self.assertTrue(r.actions[0].opt_sourceupdate is None) - self.assertTrue(r.actions[0].opt_updatelink is None) - self.assertEqual(r.state.name, 'new') - self.assertEqual(r.state.when, '2010-12-30T02:11:22') - self.assertEqual(r.state.who, 'olduser') - self.assertEqual(r.state.comment, '') - self.assertEqual(r.get_creator(), 'olduser') - exp = """\ -<request id="1234"> - <action type="submit"> - <source package="baz" project="foobar" /> - <target package="baz" project="foo" /> - </action> - <state name="new" when="2010-12-30T02:11:22" who="olduser" /> -</request>""" - self.assertEqual(exp, r.to_str()) - - def test_get_actions(self): - """test get_actions method""" - from xml.etree import cElementTree as ET - xml = open(os.path.join(self._get_fixtures_dir(), 'test_request_list_view1.xml'), 'r').read().strip() - r = osc.core.Request() - r.read(ET.fromstring(xml)) - sr_actions = r.get_actions('submit') - self.assertTrue(len(sr_actions) == 2) - for i in sr_actions: - self.assertEqual(i.type, 'submit') - self.assertTrue(len(r.get_actions('submit', 'delete', 'change_devel')) == 5) - self.assertTrue(len(r.get_actions()) == 8) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_revertfiles.py b/tests/test_revertfiles.py deleted file mode 100644 index 5a8c443..0000000 --- a/tests/test_revertfiles.py +++ /dev/null @@ -1,97 +0,0 @@ -import osc.core -import osc.oscerr -import os -from common import OscTestCase - -FIXTURES_DIR = os.path.join(os.getcwd(), 'revertfile_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestRevertFiles) - -class TestRevertFiles(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - def testRevertUnchanged(self): - """revert an unchanged file (state == ' ')""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - self.assertRaises(osc.oscerr.OscIOError, p.revert, 'toadd2') - self._check_status(p, 'toadd2', '?') - - def testRevertModified(self): - """revert a modified file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.revert('nochange') - self.__check_file('nochange') - self._check_status(p, 'nochange', ' ') - - def testRevertAdded(self): - """revert an added file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.revert('toadd1') - self.assertTrue(os.path.exists('toadd1')) - self._check_addlist('replaced\naddedmissing\n') - self._check_status(p, 'toadd1', '?') - - def testRevertDeleted(self): - """revert a deleted file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.revert('somefile') - self.__check_file('somefile') - self._check_deletelist('deleted\n') - self._check_status(p, 'somefile', ' ') - - def testRevertMissing(self): - """revert a missing (state == '!') file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.revert('missing') - self.__check_file('missing') - self._check_status(p, 'missing', ' ') - - def testRevertMissingAdded(self): - """revert a missing file which was added to the wc""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.revert('addedmissing') - self._check_addlist('toadd1\nreplaced\n') - self.assertRaises(osc.oscerr.OscIOError, p.status, 'addedmissing') - - def testRevertReplaced(self): - """revert a replaced (state == 'R') file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.revert('replaced') - self.__check_file('replaced') - self._check_addlist('toadd1\naddedmissing\n') - self._check_status(p, 'replaced', ' ') - - def testRevertConflict(self): - """revert a file which is in the conflict state""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - p.revert('foo') - self.__check_file('foo') - self.assertFalse(os.path.exists(os.path.join('.osc', '_in_conflict'))) - self._check_status(p, 'foo', ' ') - - def testRevertSkipped(self): - """revert a skipped file""" - self._change_to_pkg('simple') - p = osc.core.Package('.') - self.assertRaises(osc.oscerr.OscIOError, p.revert, 'skipped') - - def __check_file(self, fname): - storefile = os.path.join('.osc', fname) - self.assertTrue(os.path.exists(fname)) - self.assertTrue(os.path.exists(storefile)) - self.assertEqual(open(fname, 'r').read(), open(storefile, 'r').read()) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_setlinkrev.py b/tests/test_setlinkrev.py deleted file mode 100644 index 966177e..0000000 --- a/tests/test_setlinkrev.py +++ /dev/null @@ -1,73 +0,0 @@ -import osc.core -import osc.oscerr -import os -from common import GET, PUT, OscTestCase -FIXTURES_DIR = os.path.join(os.getcwd(), 'setlinkrev_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestSetLinkRev) - -class TestSetLinkRev(OscTestCase): - def setUp(self): - OscTestCase.setUp(self, copytree=False) - - def _get_fixtures_dir(self): - return FIXTURES_DIR - - @GET('http://localhost/source/osctest/simple/_link', file='simple_link') - @GET('http://localhost/source/srcprj/srcpkg?rev=latest', file='simple_filesremote') - @PUT('http://localhost/source/osctest/simple/_link', - exp='<link package="srcpkg" project="srcprj" rev="42" />', text='dummytext') - def test_simple1(self): - """a simple set_link_rev call without revision""" - osc.core.set_link_rev('http://localhost', 'osctest', 'simple') - - @GET('http://localhost/source/osctest/simple/_link', file='simple_link') - @PUT('http://localhost/source/osctest/simple/_link', - exp='<link package="srcpkg" project="srcprj" rev="42" />', text='dummytext') - def test_simple2(self): - """a simple set_link_rev call with revision""" - osc.core.set_link_rev('http://localhost', 'osctest', 'simple', '42') - - @GET('http://localhost/source/osctest/simple/_link', file='noproject_link') - @GET('http://localhost/source/osctest/srcpkg?rev=latest&expand=1', file='expandedsrc_filesremote') - @PUT('http://localhost/source/osctest/simple/_link', - exp='<link package="srcpkg" rev="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1" />', text='dummytext') - def test_expandedsrc(self): - """expand src package""" - osc.core.set_link_rev('http://localhost', 'osctest', 'simple', expand=True) - - @GET('http://localhost/source/osctest/simple/_link', file='simple_link') - @GET('http://localhost/source/srcprj/srcpkg?linkrev=base&rev=latest&expand=1', file='baserev_filesremote') - @PUT('http://localhost/source/osctest/simple/_link', - exp='<link package="srcpkg" project="srcprj" rev="abcdeeeeeeeeeeeeeeeeeeeeeeeeeeee" vrev="1" />', text='dummytext') - def test_baserev(self): - """expanded baserev revision""" - osc.core.set_link_rev('http://localhost', 'osctest', 'simple', baserev=True) - - @GET('http://localhost/source/osctest/simple/_link', file='simple_link') - @GET('http://localhost/source/srcprj/srcpkg?rev=latest&expand=1', text='conflict in file merge', code=404) - def test_linkerror(self): - """link is broken""" - import urllib2 - # the backend returns status 404 if we try to expand a broken _link - self.assertRaises(urllib2.HTTPError, osc.core.set_link_rev, 'http://localhost', 'osctest', 'simple', expand=True) - - @GET('http://localhost/source/osctest/simple/_link', file='rev_link') - @PUT('http://localhost/source/osctest/simple/_link', - exp='<link package="srcpkg" project="srcprj" />', text='dummytext') - def test_deleterev(self): - """delete rev attribute from link xml""" - osc.core.set_link_rev('http://localhost', 'osctest', 'simple', revision=None) - - @GET('http://localhost/source/osctest/simple/_link', file='simple_link') - @PUT('http://localhost/source/osctest/simple/_link', - exp='<link package="srcpkg" project="srcprj" />', text='dummytext') - def test_deleterevnonexistent(self): - """delete non existent rev attribute from link xml""" - osc.core.set_link_rev('http://localhost', 'osctest', 'simple', revision=None) - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/test_update.py b/tests/test_update.py deleted file mode 100644 index 27c1c62..0000000 --- a/tests/test_update.py +++ /dev/null @@ -1,288 +0,0 @@ -import osc.core -import osc.oscerr -import os -import sys -from common import GET, OscTestCase -FIXTURES_DIR = os.path.join(os.getcwd(), 'update_fixtures') - -def suite(): - import unittest - return unittest.makeSuite(TestUpdate) - -class TestUpdate(OscTestCase): - def _get_fixtures_dir(self): - return FIXTURES_DIR - - @GET('http://localhost/source/osctest/simple?rev=latest', file='testUpdateNoChanges_files') - @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml') - def testUpdateNoChanges(self): - """update without any changes (the wc is the most recent version)""" - self._change_to_pkg('simple') - osc.core.Package('.').update() - self.assertEqual(sys.stdout.getvalue(), 'At revision 1.\n') - - @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateNewFile_files') - @GET('http://localhost/source/osctest/simple/upstream_added?rev=2', file='testUpdateNewFile_upstream_added') - @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml') - def testUpdateNewFile(self): - """a new file was added to the remote package""" - self._change_to_pkg('simple') - osc.core.Package('.').update(rev=2) - exp = 'A upstream_added\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testUpdateNewFile_files') - - @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateNewFileLocalExists_files') - def testUpdateNewFileLocalExists(self): - """ - a new file was added to the remote package but the same (unversioned) - file exists locally - """ - self._change_to_pkg('simple') - self.assertRaises(osc.oscerr.PackageFileConflict, osc.core.Package('.').update, rev=2) - - @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateDeletedFile_files') - @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml') - def testUpdateDeletedFile(self): - """a file was deleted from the remote package""" - self._change_to_pkg('simple') - osc.core.Package('.').update(rev=2) - exp = 'D foo\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testUpdateDeletedFile_files') - self.assertFalse(os.path.exists('foo')) - self.assertFalse(os.path.exists(os.path.join('.osc', 'foo'))) - - @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateUpstreamModifiedFile_files') - @GET('http://localhost/source/osctest/simple/foo?rev=2', file='testUpdateUpstreamModifiedFile_foo') - @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml') - def testUpdateUpstreamModifiedFile(self): - """a file was modified in the remote package (local file isn't modified)""" - - self._change_to_pkg('simple') - osc.core.Package('.').update(rev=2) - exp = 'U foo\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testUpdateUpstreamModifiedFile_files') - - @GET('http://localhost/source/osctest/conflict?rev=2', file='testUpdateConflict_files') - @GET('http://localhost/source/osctest/conflict/merge?rev=2', file='testUpdateConflict_merge') - @GET('http://localhost/source/osctest/conflict/_meta', file='meta.xml') - def testUpdateConflict(self): - """ - a file was modified in the remote package (local file is also modified - and a merge isn't possible) - """ - self._change_to_pkg('conflict') - osc.core.Package('.').update(rev=2) - exp = 'C merge\nAt revision 2.\n' - self._check_digests('testUpdateConflict_files') - self.assertEqual(sys.stdout.getvalue(), exp) - 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') - @GET('http://localhost/source/osctest/already_in_conflict/_meta', file='meta.xml') - def testUpdateAlreadyInConflict(self): - """ - a file was modified in the remote package (the local file is already in conflict) - """ - self._change_to_pkg('already_in_conflict') - 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') - @GET('http://localhost/source/osctest/deleted/foo?rev=2', file='testUpdateLocalDeletions_foo') - @GET('http://localhost/source/osctest/deleted/merge?rev=2', file='testUpdateLocalDeletions_merge') - @GET('http://localhost/source/osctest/deleted/_meta', file='meta.xml') - def testUpdateLocalDeletions(self): - """ - the files 'foo' and 'merge' were modified in the remote package - and marked for deletion in the local wc. Additionally the file - 'merge' was modified in the wc before deletion so the local file - still exists (and a merge with the remote file is not possible) - """ - self._change_to_pkg('deleted') - osc.core.Package('.').update(rev=2) - exp = 'U foo\nC merge\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - 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') - - @GET('http://localhost/source/osctest/restore?rev=latest', file='testUpdateRestore_files') - @GET('http://localhost/source/osctest/restore/foo?rev=1', file='testUpdateRestore_foo') - @GET('http://localhost/source/osctest/restore/_meta', file='meta.xml') - def testUpdateRestore(self): - """local file 'foo' was deleted with a non osc command and will be restored""" - self._change_to_pkg('restore') - osc.core.Package('.').update() - exp = 'Restored \'foo\'\nAt revision 1.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testUpdateRestore_files') - - @GET('http://localhost/source/osctest/limitsize?rev=latest', file='testUpdateLimitSizeNoChange_filesremote') - @GET('http://localhost/source/osctest/limitsize/_meta', file='meta.xml') - def testUpdateLimitSizeNoChange(self): - """ - a new file was added to the remote package but isn't checked out because - of the size constraint - """ - self._change_to_pkg('limitsize') - osc.core.Package('.').update(size_limit=50) - exp = 'D bigfile\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists(os.path.join('.osc', 'bigfile'))) - self.assertFalse(os.path.exists('bigfile')) - self._check_digests('testUpdateLimitSizeNoChange_files', 'bigfile') - - @GET('http://localhost/source/osctest/limitsize_local?rev=latest', file='testUpdateLocalLimitSizeNoChange_filesremote') - @GET('http://localhost/source/osctest/limitsize_local/_meta', file='meta.xml') - def testUpdateLocalLimitSizeNoChange(self): - """ - a new file was added to the remote package but isn't checked out because - of the local size constraint - """ - self._change_to_pkg('limitsize_local') - p = osc.core.Package('.') - p.update() - exp = 'D bigfile\nD merge\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists(os.path.join('.osc', 'bigfile'))) - self.assertFalse(os.path.exists(os.path.join('.osc', 'merge'))) - self.assertFalse(os.path.exists('bigfile')) - self._check_digests('testUpdateLocalLimitSizeNoChange_files', 'bigfile', 'merge') - self._check_status(p, 'bigfile', 'S') - self._check_status(p, 'merge', 'S') - - @GET('http://localhost/source/osctest/limitsize?rev=latest', file='testUpdateLimitSizeAddDelete_filesremote') - @GET('http://localhost/source/osctest/limitsize/exists?rev=2', file='testUpdateLimitSizeAddDelete_exists') - @GET('http://localhost/source/osctest/limitsize/_meta', file='meta.xml') - def testUpdateLimitSizeAddDelete(self): - """ - a new file (exists) was added to the remote package with - size < size_limit and one file (nochange) was deleted from the - remote package (local file 'nochange' is modified). Additionally - files which didn't change are removed the local wc due to the - size constraint. - """ - self._change_to_pkg('limitsize') - osc.core.Package('.').update(size_limit=10) - exp = 'A exists\nD bigfile\nD foo\nD merge\nD nochange\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists(os.path.join('.osc', 'bigfile'))) - self.assertFalse(os.path.exists('bigfile')) - self.assertFalse(os.path.exists(os.path.join('.osc', 'foo'))) - self.assertFalse(os.path.exists('foo')) - self.assertFalse(os.path.exists(os.path.join('.osc', 'merge'))) - self.assertFalse(os.path.exists('merge')) - # exists because local version is modified - self.assertTrue(os.path.exists('nochange')) - - 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): - """update package with _service:* files""" - 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') - - @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/_meta', file='meta.xml') - def testUpdateDisableAddDeleteServiceFiles(self): - """update package with _service:* files (with service_files=False)""" - self._change_to_pkg('services') - osc.core.Package('.').update() - exp = 'A bigfile\nD _service:exists\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists(os.path.join('.osc', '_service:bar'))) - self.assertFalse(os.path.exists('_service:bar')) - self.assertFalse(os.path.exists(os.path.join('.osc', '_service:foo'))) - self.assertFalse(os.path.exists('_service:foo')) - self.assertTrue(os.path.exists('_service:exists')) - self._check_digests('testUpdateServiceFilesAddDelete_files', '_service:foo', '_service:bar') - - @GET('http://localhost/source/osctest/metamode?meta=1&rev=latest', file='testUpdateMetaMode_filesremote') - @GET('http://localhost/source/osctest/metamode/_meta?rev=1', file='testUpdateMetaMode__meta') - def testUpdateMetaMode(self): - """update package with metamode enabled""" - self._change_to_pkg('metamode') - p = osc.core.Package('.') - p.update() - exp = 'A _meta\nD foo\nD merge\nD nochange\nAt revision 1.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists('foo')) - self.assertFalse(os.path.exists('merge')) - self.assertFalse(os.path.exists('nochange')) - self._check_digests('testUpdateMetaMode_filesremote') - self._check_status(p, '_meta', ' ') - - @GET('http://localhost/source/osctest/new?rev=latest', file='testUpdateNew_filesremote') - @GET('http://localhost/source/osctest/new/_meta', file='meta.xml') - def testUpdateNew(self): - """update a new (empty) package. The package has no revision.""" - self._change_to_pkg('new') - p = osc.core.Package('.') - p.update() - exp = 'At revision None.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self._check_digests('testUpdateNew_filesremote') - - # tests to recover from an aborted/broken update - - @GET('http://localhost/source/osctest/simple/foo?rev=2', file='testUpdateResume_foo') - @GET('http://localhost/source/osctest/simple/merge?rev=2', file='testUpdateResume_merge') - @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml') - @GET('http://localhost/source/osctest/simple?rev=2', file='testUpdateResume_files') - @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml') - def testUpdateResume(self): - """resume an aborted update""" - self._change_to_pkg('resume') - osc.core.Package('.').update(rev=2) - exp = 'resuming broken update...\nU foo\nU merge\nAt revision 2.\nAt revision 2.\n' - self.assertEqual(sys.stdout.getvalue(), exp) - self.assertFalse(os.path.exists(os.path.join('.osc', '_in_update'))) - self._check_digests('testUpdateResume_files') - - @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') - @GET('http://localhost/source/osctest/simple?rev=1', file='testUpdateResumeDeletedFile_files') - @GET('http://localhost/source/osctest/simple/_meta', file='meta.xml') - def testUpdateResumeDeletedFile(self): - """ - resume an aborted update (the file 'added' was already deleted in the first update - run). It's marked as deleted again (this is due to an expected issue with the update - code) - """ - self._change_to_pkg('resume_deleted') - osc.core.Package('.').update(rev=1) - 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') - -if __name__ == '__main__': - import unittest - unittest.main() diff --git a/tests/update_fixtures/meta.xml b/tests/update_fixtures/meta.xml deleted file mode 100644 index abd3720..0000000 --- a/tests/update_fixtures/meta.xml +++ /dev/null @@ -1,8 +0,0 @@ -<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 deleted file mode 100644 index a30e040..0000000 --- a/tests/update_fixtures/oscrc +++ /dev/null @@ -1,103 +0,0 @@ -[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 deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/.osc/_packages b/tests/update_fixtures/osctest/.osc/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/update_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/update_fixtures/osctest/.osc/_project b/tests/update_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/update_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_apiurl b/tests/update_fixtures/osctest/already_in_conflict/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_files b/tests/update_fixtures/osctest/already_in_conflict/.osc/_files deleted file mode 100644 index 2ad5954..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index a00af07..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -merge diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_meta b/tests/update_fixtures/osctest/already_in_conflict/.osc/_meta deleted file mode 100644 index 0150d60..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/_meta +++ /dev/null @@ -1,8 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/already_in_conflict/.osc/_package b/tests/update_fixtures/osctest/already_in_conflict/.osc/_package deleted file mode 100644 index c2cae8d..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/foo +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 7469d51..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/merge +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/already_in_conflict/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/conflict/.osc/_apiurl b/tests/update_fixtures/osctest/conflict/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/conflict/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/conflict/.osc/_files b/tests/update_fixtures/osctest/conflict/.osc/_files deleted file mode 100644 index a67ff42..0000000 --- a/tests/update_fixtures/osctest/conflict/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/conflict/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/conflict/.osc/_package b/tests/update_fixtures/osctest/conflict/.osc/_package deleted file mode 100644 index 783a0ef..0000000 --- a/tests/update_fixtures/osctest/conflict/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/conflict/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/conflict/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/conflict/.osc/merge b/tests/update_fixtures/osctest/conflict/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/conflict/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/conflict/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/conflict/foo b/tests/update_fixtures/osctest/conflict/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/conflict/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/conflict/merge b/tests/update_fixtures/osctest/conflict/merge deleted file mode 100644 index f4ff164..0000000 --- a/tests/update_fixtures/osctest/conflict/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/conflict/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/deleted/.osc/_apiurl b/tests/update_fixtures/osctest/deleted/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/deleted/.osc/_files b/tests/update_fixtures/osctest/deleted/.osc/_files deleted file mode 100644 index d9a5451..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/deleted/.osc/_package b/tests/update_fixtures/osctest/deleted/.osc/_package deleted file mode 100644 index 3c22137..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index fa7a1f7..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/_to_be_deleted +++ /dev/null @@ -1,2 +0,0 @@ -merge -foo diff --git a/tests/update_fixtures/osctest/deleted/.osc/foo b/tests/update_fixtures/osctest/deleted/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/deleted/.osc/merge b/tests/update_fixtures/osctest/deleted/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/deleted/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/deleted/merge b/tests/update_fixtures/osctest/deleted/merge deleted file mode 100644 index c229519..0000000 --- a/tests/update_fixtures/osctest/deleted/merge +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/deleted/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_apiurl b/tests/update_fixtures/osctest/limitsize/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/limitsize/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_files b/tests/update_fixtures/osctest/limitsize/.osc/_files deleted file mode 100644 index 77d67af..0000000 --- a/tests/update_fixtures/osctest/limitsize/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/limitsize/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_package b/tests/update_fixtures/osctest/limitsize/.osc/_package deleted file mode 100644 index edc7cc1..0000000 --- a/tests/update_fixtures/osctest/limitsize/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -limitsize diff --git a/tests/update_fixtures/osctest/limitsize/.osc/_project b/tests/update_fixtures/osctest/limitsize/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/limitsize/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/limitsize/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/limitsize/.osc/merge b/tests/update_fixtures/osctest/limitsize/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/limitsize/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/limitsize/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/limitsize/foo b/tests/update_fixtures/osctest/limitsize/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/limitsize/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/limitsize/merge b/tests/update_fixtures/osctest/limitsize/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/limitsize/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 3a48a29..0000000 --- a/tests/update_fixtures/osctest/limitsize/nochange +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_files b/tests/update_fixtures/osctest/limitsize_local/.osc/_files deleted file mode 100644 index 77d67af..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_package b/tests/update_fixtures/osctest/limitsize_local/.osc/_package deleted file mode 100644 index 64a5ed3..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -limitsize_local diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/_project b/tests/update_fixtures/osctest/limitsize_local/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 64bb6b7..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/_size_limit +++ /dev/null @@ -1 +0,0 @@ -30 diff --git a/tests/update_fixtures/osctest/limitsize_local/.osc/foo b/tests/update_fixtures/osctest/limitsize_local/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/limitsize_local/foo b/tests/update_fixtures/osctest/limitsize_local/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/limitsize_local/merge b/tests/update_fixtures/osctest/limitsize_local/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 3a48a29..0000000 --- a/tests/update_fixtures/osctest/limitsize_local/nochange +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/metamode/.osc/_files b/tests/update_fixtures/osctest/metamode/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index e69de29..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/_meta_mode +++ /dev/null diff --git a/tests/update_fixtures/osctest/metamode/.osc/_osclib_version b/tests/update_fixtures/osctest/metamode/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/metamode/.osc/_package b/tests/update_fixtures/osctest/metamode/.osc/_package deleted file mode 100644 index 862084f..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -metamode diff --git a/tests/update_fixtures/osctest/metamode/.osc/_project b/tests/update_fixtures/osctest/metamode/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/metamode/.osc/merge b/tests/update_fixtures/osctest/metamode/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/metamode/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/metamode/foo b/tests/update_fixtures/osctest/metamode/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/metamode/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/metamode/merge b/tests/update_fixtures/osctest/metamode/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/metamode/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/metamode/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/new/.osc/_apiurl b/tests/update_fixtures/osctest/new/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/new/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/new/.osc/_files b/tests/update_fixtures/osctest/new/.osc/_files deleted file mode 100644 index d915967..0000000 --- a/tests/update_fixtures/osctest/new/.osc/_files +++ /dev/null @@ -1 +0,0 @@ -<directory name="new" /> diff --git a/tests/update_fixtures/osctest/new/.osc/_osclib_version b/tests/update_fixtures/osctest/new/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/new/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/new/.osc/_package b/tests/update_fixtures/osctest/new/.osc/_package deleted file mode 100644 index 3e75765..0000000 --- a/tests/update_fixtures/osctest/new/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -new diff --git a/tests/update_fixtures/osctest/new/.osc/_project b/tests/update_fixtures/osctest/new/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/new/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/restore/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/restore/.osc/_files b/tests/update_fixtures/osctest/restore/.osc/_files deleted file mode 100644 index a6b0cc6..0000000 --- a/tests/update_fixtures/osctest/restore/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/restore/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/restore/.osc/_package b/tests/update_fixtures/osctest/restore/.osc/_package deleted file mode 100644 index a9db91d..0000000 --- a/tests/update_fixtures/osctest/restore/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -restore diff --git a/tests/update_fixtures/osctest/restore/.osc/_project b/tests/update_fixtures/osctest/restore/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/restore/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/restore/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/restore/.osc/merge b/tests/update_fixtures/osctest/restore/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/restore/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/restore/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/restore/exists b/tests/update_fixtures/osctest/restore/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/update_fixtures/osctest/restore/exists +++ /dev/null diff --git a/tests/update_fixtures/osctest/restore/merge b/tests/update_fixtures/osctest/restore/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/restore/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/restore/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/resume/.osc/_apiurl b/tests/update_fixtures/osctest/resume/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/resume/.osc/_files b/tests/update_fixtures/osctest/resume/.osc/_files deleted file mode 100644 index e4f249e..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 0b0a0c8..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/_in_update/_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/_in_update/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/resume/.osc/_meta b/tests/update_fixtures/osctest/resume/.osc/_meta deleted file mode 100644 index abd3720..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/_meta +++ /dev/null @@ -1,8 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/resume/.osc/_package b/tests/update_fixtures/osctest/resume/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 0527e6b..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/added +++ /dev/null @@ -1 +0,0 @@ -This is a test diff --git a/tests/update_fixtures/osctest/resume/.osc/foo b/tests/update_fixtures/osctest/resume/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/resume/.osc/merge b/tests/update_fixtures/osctest/resume/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/resume/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/resume/added b/tests/update_fixtures/osctest/resume/added deleted file mode 100644 index 0527e6b..0000000 --- a/tests/update_fixtures/osctest/resume/added +++ /dev/null @@ -1 +0,0 @@ -This is a test diff --git a/tests/update_fixtures/osctest/resume/exists b/tests/update_fixtures/osctest/resume/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/update_fixtures/osctest/resume/exists +++ /dev/null diff --git a/tests/update_fixtures/osctest/resume/foo b/tests/update_fixtures/osctest/resume/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/resume/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/resume/merge b/tests/update_fixtures/osctest/resume/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/resume/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/resume/nochange +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_files b/tests/update_fixtures/osctest/resume_deleted/.osc/_files deleted file mode 100644 index 5796136..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index f0dac1f..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_in_update/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 323fae0..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_in_update/foo +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_meta b/tests/update_fixtures/osctest/resume_deleted/.osc/_meta deleted file mode 100644 index abd3720..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_meta +++ /dev/null @@ -1,8 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/_package b/tests/update_fixtures/osctest/resume_deleted/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index e69de29..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/added +++ /dev/null diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/foo b/tests/update_fixtures/osctest/resume_deleted/.osc/foo deleted file mode 100644 index 323fae0..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/update_fixtures/osctest/resume_deleted/.osc/merge b/tests/update_fixtures/osctest/resume_deleted/.osc/merge deleted file mode 100644 index 2563d89..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/merge +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/resume_deleted/added b/tests/update_fixtures/osctest/resume_deleted/added deleted file mode 100644 index e69de29..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/added +++ /dev/null diff --git a/tests/update_fixtures/osctest/resume_deleted/exists b/tests/update_fixtures/osctest/resume_deleted/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/exists +++ /dev/null diff --git a/tests/update_fixtures/osctest/resume_deleted/f b/tests/update_fixtures/osctest/resume_deleted/f deleted file mode 100644 index 0527e6b..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/f +++ /dev/null @@ -1 +0,0 @@ -This is a test diff --git a/tests/update_fixtures/osctest/resume_deleted/foo b/tests/update_fixtures/osctest/resume_deleted/foo deleted file mode 100644 index 323fae0..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/foo +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/update_fixtures/osctest/resume_deleted/merge b/tests/update_fixtures/osctest/resume_deleted/merge deleted file mode 100644 index 2563d89..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/merge +++ /dev/null @@ -1,5 +0,0 @@ -xxx -xxx -yyy -zzz -zzz diff --git a/tests/update_fixtures/osctest/resume_deleted/nochange b/tests/update_fixtures/osctest/resume_deleted/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/resume_deleted/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/services/.osc/_apiurl b/tests/update_fixtures/osctest/services/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/services/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/services/.osc/_files b/tests/update_fixtures/osctest/services/.osc/_files deleted file mode 100644 index 9209ca9..0000000 --- a/tests/update_fixtures/osctest/services/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/services/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/services/.osc/_package b/tests/update_fixtures/osctest/services/.osc/_package deleted file mode 100644 index f7a48f2..0000000 --- a/tests/update_fixtures/osctest/services/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -services diff --git a/tests/update_fixtures/osctest/services/.osc/_project b/tests/update_fixtures/osctest/services/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/services/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/services/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/services/.osc/merge b/tests/update_fixtures/osctest/services/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/services/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 85e1c2f..0000000 --- a/tests/update_fixtures/osctest/services/_service:exists +++ /dev/null @@ -1,2 +0,0 @@ -another service -foo diff --git a/tests/update_fixtures/osctest/services/foo b/tests/update_fixtures/osctest/services/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/services/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/services/merge b/tests/update_fixtures/osctest/services/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/services/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0afeace..0000000 --- a/tests/update_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/update_fixtures/osctest/simple/.osc/_files b/tests/update_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index f0dac1f..0000000 --- a/tests/update_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index d3827e7..0000000 --- a/tests/update_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/update_fixtures/osctest/simple/.osc/_package b/tests/update_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/update_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index cea3bc8..0000000 --- a/tests/update_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/simple/.osc/merge b/tests/update_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 0569b03..0000000 --- a/tests/update_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/update_fixtures/osctest/simple/exists b/tests/update_fixtures/osctest/simple/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/update_fixtures/osctest/simple/exists +++ /dev/null diff --git a/tests/update_fixtures/osctest/simple/foo b/tests/update_fixtures/osctest/simple/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/osctest/simple/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/osctest/simple/merge b/tests/update_fixtures/osctest/simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/osctest/simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 3a48a29..0000000 --- a/tests/update_fixtures/osctest/simple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. diff --git a/tests/update_fixtures/testUpdateAlreadyInConflict_files b/tests/update_fixtures/testUpdateAlreadyInConflict_files deleted file mode 100644 index 96b9752..0000000 --- a/tests/update_fixtures/testUpdateAlreadyInConflict_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 323fae0..0000000 --- a/tests/update_fixtures/testUpdateAlreadyInConflict_merge +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/update_fixtures/testUpdateConflict_files b/tests/update_fixtures/testUpdateConflict_files deleted file mode 100644 index 93cd6a2..0000000 --- a/tests/update_fixtures/testUpdateConflict_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index f9f1e5a..0000000 --- a/tests/update_fixtures/testUpdateConflict_merge +++ /dev/null @@ -1,4 +0,0 @@ -Is -it possible to -merge this file? -We'll see. diff --git a/tests/update_fixtures/testUpdateDeletedFile_files b/tests/update_fixtures/testUpdateDeletedFile_files deleted file mode 100644 index 9a8cc25..0000000 --- a/tests/update_fixtures/testUpdateDeletedFile_files +++ /dev/null @@ -1,4 +0,0 @@ -<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 deleted file mode 100644 index ac79041..0000000 --- a/tests/update_fixtures/testUpdateLimitSizeAddDelete_exists +++ /dev/null @@ -1 +0,0 @@ -small diff --git a/tests/update_fixtures/testUpdateLimitSizeAddDelete_files b/tests/update_fixtures/testUpdateLimitSizeAddDelete_files deleted file mode 100644 index a06a209..0000000 --- a/tests/update_fixtures/testUpdateLimitSizeAddDelete_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 329f100..0000000 --- a/tests/update_fixtures/testUpdateLimitSizeAddDelete_filesremote +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 1745544..0000000 --- a/tests/update_fixtures/testUpdateLimitSizeNoChange_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 6a3ced8..0000000 --- a/tests/update_fixtures/testUpdateLimitSizeNoChange_filesremote +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index d1b7f80..0000000 --- a/tests/update_fixtures/testUpdateLocalDeletions_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 0319af9..0000000 --- a/tests/update_fixtures/testUpdateLocalDeletions_foo +++ /dev/null @@ -1,2 +0,0 @@ -This is a simple test. -And an update diff --git a/tests/update_fixtures/testUpdateLocalDeletions_merge b/tests/update_fixtures/testUpdateLocalDeletions_merge deleted file mode 100644 index df2934d..0000000 --- a/tests/update_fixtures/testUpdateLocalDeletions_merge +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index f03a9b5..0000000 --- a/tests/update_fixtures/testUpdateLocalLimitSizeNoChange_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 4ffd780..0000000 --- a/tests/update_fixtures/testUpdateLocalLimitSizeNoChange_filesremote +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 2c2c701..0000000 --- a/tests/update_fixtures/testUpdateMetaMode__meta +++ /dev/null @@ -1,4 +0,0 @@ -<package project="osctest" name="metamode"> - <title>foo</title> - <description /> -</package> diff --git a/tests/update_fixtures/testUpdateMetaMode_filesremote b/tests/update_fixtures/testUpdateMetaMode_filesremote deleted file mode 100644 index faca442..0000000 --- a/tests/update_fixtures/testUpdateMetaMode_filesremote +++ /dev/null @@ -1,3 +0,0 @@ -<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 deleted file mode 100644 index 9ca11f8..0000000 --- a/tests/update_fixtures/testUpdateNewFileLocalExists_exists +++ /dev/null @@ -1 +0,0 @@ -exists diff --git a/tests/update_fixtures/testUpdateNewFileLocalExists_files b/tests/update_fixtures/testUpdateNewFileLocalExists_files deleted file mode 100644 index 543b47e..0000000 --- a/tests/update_fixtures/testUpdateNewFileLocalExists_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index f852ed2..0000000 --- a/tests/update_fixtures/testUpdateNewFile_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/testUpdateNewFile_upstream_added +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/testUpdateNew_filesremote b/tests/update_fixtures/testUpdateNew_filesremote deleted file mode 100644 index 432daa9..0000000 --- a/tests/update_fixtures/testUpdateNew_filesremote +++ /dev/null @@ -1,2 +0,0 @@ -<directory name="new"> -</directory> diff --git a/tests/update_fixtures/testUpdateNoChanges_files b/tests/update_fixtures/testUpdateNoChanges_files deleted file mode 100644 index d2e3da5..0000000 --- a/tests/update_fixtures/testUpdateNoChanges_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index d2e3da5..0000000 --- a/tests/update_fixtures/testUpdateRestore_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/testUpdateRestore_foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/testUpdateResumeDeletedFile_files b/tests/update_fixtures/testUpdateResumeDeletedFile_files deleted file mode 100644 index d2e3da5..0000000 --- a/tests/update_fixtures/testUpdateResumeDeletedFile_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/update_fixtures/testUpdateResumeDeletedFile_foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/update_fixtures/testUpdateResumeDeletedFile_merge b/tests/update_fixtures/testUpdateResumeDeletedFile_merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/update_fixtures/testUpdateResumeDeletedFile_merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/update_fixtures/testUpdateResume_files b/tests/update_fixtures/testUpdateResume_files deleted file mode 100644 index 0b0a0c8..0000000 --- a/tests/update_fixtures/testUpdateResume_files +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 323fae0..0000000 --- a/tests/update_fixtures/testUpdateResume_foo +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/update_fixtures/testUpdateResume_merge b/tests/update_fixtures/testUpdateResume_merge deleted file mode 100644 index 2563d89..0000000 --- a/tests/update_fixtures/testUpdateResume_merge +++ /dev/null @@ -1,5 +0,0 @@ -xxx -xxx -yyy -zzz -zzz diff --git a/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:bar b/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:bar deleted file mode 100644 index 5fe9f1f..0000000 --- a/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:bar +++ /dev/null @@ -1 +0,0 @@ -another service diff --git a/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:foo b/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:foo deleted file mode 100644 index ac79041..0000000 --- a/tests/update_fixtures/testUpdateServiceFilesAddDelete__service:foo +++ /dev/null @@ -1 +0,0 @@ -small diff --git a/tests/update_fixtures/testUpdateServiceFilesAddDelete_bigfile b/tests/update_fixtures/testUpdateServiceFilesAddDelete_bigfile deleted file mode 100644 index 8b7b0f9..0000000 --- a/tests/update_fixtures/testUpdateServiceFilesAddDelete_bigfile +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 35e0945..0000000 --- a/tests/update_fixtures/testUpdateServiceFilesAddDelete_files +++ /dev/null @@ -1,7 +0,0 @@ -<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 deleted file mode 100644 index 8f4e3ae..0000000 --- a/tests/update_fixtures/testUpdateServiceFilesAddDelete_filesremote +++ /dev/null @@ -1,7 +0,0 @@ -<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 deleted file mode 100644 index c605722..0000000 --- a/tests/update_fixtures/testUpdateUpstreamModifiedFile_files +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 4083ca8..0000000 --- a/tests/update_fixtures/testUpdateUpstreamModifiedFile_foo +++ /dev/null @@ -1,3 +0,0 @@ -<added> -This is a simple test. -<added> |