diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2016-06-16 22:09:50 +0300 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-08-30 14:22:27 +0300 |
commit | 96c28886048f46040c39254b9fea1497c7e9192e (patch) | |
tree | a437e43a5f56ea9b5b5f87addfc45e4440d2e4c4 | |
parent | 39136ce032bc74a3ea7ee477d292e468226a3081 (diff) |
Tests for packages with per-version hints
Tests for packages with per-version and override hints
24 files changed, 85 insertions, 1 deletions
diff --git a/test/testdata/htdocs.expected/x86/packages.inc b/test/testdata/htdocs.expected/x86/packages.inc index 367e3fd..cfb3c5f 100755 --- a/test/testdata/htdocs.expected/x86/packages.inc +++ b/test/testdata/htdocs.expected/x86/packages.inc @@ -17,6 +17,7 @@ <tr><td><a href="x86/libdns_sd1">libdns_sd1</a></td><td>Bonjour Zeroconf implementation</td></tr> <tr><td><a href="x86/mDNSResponder">mDNSResponder</a></td><td>Bonjour Zeroconf implementation</td></tr> <tr><td><a href="x86/openssh">openssh</a></td><td>The OpenSSH server and client programs</td></tr> +<tr><td><a href="x86/per-version">per-version</a></td><td>Per-version hint test package</td></tr> <tr><td><a href="x86/perl-Net-SMTP-SSL">perl-Net-SMTP-SSL</a></td><td>Perl distribution Net-SMTP-SSL</td></tr> <tr><td><a href="x86/rpm-doc">rpm-doc</a></td><td>Obsolete package for RPM package management system manual pages</td></tr> <tr><td><a href="x86/testpackage">testpackage</a></td><td>A test package</td></tr> diff --git a/test/testdata/htdocs.expected/x86/per-version/.htaccess b/test/testdata/htdocs.expected/x86/per-version/.htaccess new file mode 100644 index 0000000..3196d64 --- /dev/null +++ b/test/testdata/htdocs.expected/x86/per-version/.htaccess @@ -0,0 +1,3 @@ +Options Indexes +IndexOptions -FancyIndexing +AddType text/html 1 2 3 4 5 6 7 8 9 diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1 b/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1 new file mode 100644 index 0000000..08c3fcf --- /dev/null +++ b/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1 @@ -0,0 +1,7 @@ +<html> +<h1>per-version: Per-version hint test package (installed binaries and support files)</h1> +<tt><pre> + 2015-10-11 14:45 26 test/test.1 + 2015-10-11 14:45 31 test/test.2 +</pre></tt> +</html> diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src b/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src new file mode 100644 index 0000000..9c9bf12 --- /dev/null +++ b/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src @@ -0,0 +1,7 @@ +<html> +<h1>per-version: Per-version hint test package (source code)</h1> +<tt><pre> + 2015-10-11 14:45 26 test/test.1 + 2015-10-11 14:45 31 test/test.2 +</pre></tt> +</html> diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1 b/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1 new file mode 100644 index 0000000..08c3fcf --- /dev/null +++ b/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1 @@ -0,0 +1,7 @@ +<html> +<h1>per-version: Per-version hint test package (installed binaries and support files)</h1> +<tt><pre> + 2015-10-11 14:45 26 test/test.1 + 2015-10-11 14:45 31 test/test.2 +</pre></tt> +</html> diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src b/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src new file mode 100644 index 0000000..9c9bf12 --- /dev/null +++ b/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src @@ -0,0 +1,7 @@ +<html> +<h1>per-version: Per-version hint test package (source code)</h1> +<tt><pre> + 2015-10-11 14:45 26 test/test.1 + 2015-10-11 14:45 31 test/test.2 +</pre></tt> +</html> diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected index 3c60a3c..2ef3c93 100644 --- a/test/testdata/inifile/setup.ini.expected +++ b/test/testdata/inifile/setup.ini.expected @@ -192,6 +192,23 @@ 'source: x86/release/openssh/openssh-7.2p2-1-src.tar.xz 228 ' 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' '\n' + '@ per-version\n' + 'sdesc: "Per-version hint test package"\n' + 'ldesc: "Per-version hint test package"\n' + 'category: Base\n' + 'requires: base-cygwin cygwin\n' + 'version: 4.8-1\n' + 'install: x86/release/per-version/per-version-4.8-1.tar.xz 228 ' + 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' + 'source: x86/release/per-version/per-version-4.8-1-src.tar.xz 228 ' + 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' + '[prev]\n' + 'version: 4.0-1\n' + 'install: x86/release/per-version/per-version-4.0-1.tar.xz 228 ' + 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' + 'source: x86/release/per-version/per-version-4.0-1-src.tar.xz 228 ' + 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n' + '\n' '@ perl-Net-SMTP-SSL\n' 'sdesc: "Perl distribution Net-SMTP-SSL"\n' 'ldesc: "Implements the same API as Net::SMTP, but uses IO::Socket::SSL for\n' diff --git a/test/testdata/pkglist/cygwin-pkg-maint b/test/testdata/pkglist/cygwin-pkg-maint index 0dc42e7..9557e0a 100644 --- a/test/testdata/pkglist/cygwin-pkg-maint +++ b/test/testdata/pkglist/cygwin-pkg-maint @@ -1701,6 +1701,8 @@ perl-XML-Simple Achim Gratz/Yaakov Selkowitz perl-XML-Writer Achim Gratz/Ken Brown perl-YAML Achim Gratz/Yaakov Selkowitz perl-YAML-LibYAML Achim Gratz +per-version Blooey McFooey +per-version-incomplete Blooey McFooey phodav Yaakov Selkowitz phonon Yaakov Selkowitz phonon-backend-gstreamer Yaakov Selkowitz diff --git a/test/testdata/pkglist/expected b/test/testdata/pkglist/expected index 0f5bb1c..3a5ea77 100644 --- a/test/testdata/pkglist/expected +++ b/test/testdata/pkglist/expected @@ -3,7 +3,7 @@ 'Adam Dinwoodie': maintainers.Maintainer('Adam Dinwoodie', [], ['git']), 'Alexey Sokolov': maintainers.Maintainer('Alexey Sokolov', [], ['znc']), 'Andrew Schulman': maintainers.Maintainer('Andrew Schulman', [], ['atool', 'autossh', 'bc', 'discus', 'fish', 'lftp', 'libargp', 'nosleep', 'orpie', 'pinfo', 'ploticus', 'ploticus-doc', 'screen', 'sitecopy', 'sng', 'socat', 'stow', 'stunnel', 'time', 'unison2.27', 'unison2.32', 'unison2.40', 'unison2.45', 'unison2.48']), - 'Blooey McFooey': maintainers.Maintainer('Blooey McFooey', [], ['corrupt', 'perl-Net-SMTP-SSL', 'testpackage']), + 'Blooey McFooey': maintainers.Maintainer('Blooey McFooey', [], ['corrupt', 'perl-Net-SMTP-SSL', 'per-version', 'per-version-incomplete', 'testpackage']), 'Bob Heckel': maintainers.Maintainer('Bob Heckel', [], ['libgc', 'w3m']), 'Charles Wilson': maintainers.Maintainer('Charles Wilson', [], ['alternatives', 'autobuild', 'cygutils', 'gcc-tools-epoch1-autoconf', 'gcc-tools-epoch1-automake', 'gcc-tools-epoch2-autoconf', 'gcc-tools-epoch2-automake', 'inetutils', 'libassuan', 'libksba', 'libustr', 'libXpm-noX', 'mingw-binutils', 'mingw-bzip2', 'mingw-gcc', 'mingw-libgcrypt', 'mingw-libgpg-error', 'mingw-pthreads', 'mingw-xz', 'mingw-zlib', 'nfrotz', 'pinentry', 'pth', 'rsh', 'run2', 'rxvt', 'sunrpc', 'tcp_wrappers', 'xsri']), 'Chris J. Breisch': maintainers.Maintainer('Chris J. Breisch', [], ['man-db']), diff --git a/test/testdata/process_arch/htdocs.expected b/test/testdata/process_arch/htdocs.expected index 448a696..3064957 100644 --- a/test/testdata/process_arch/htdocs.expected +++ b/test/testdata/process_arch/htdocs.expected @@ -20,6 +20,11 @@ 'x86/libdns_sd1': ['.htaccess', 'libdns_sd1-379.32.1-1'], 'x86/mDNSResponder': ['.htaccess', 'mDNSResponder-379.32.1-1', 'mDNSResponder-379.32.1-1-src'], 'x86/openssh': ['.htaccess', 'openssh-7.2p2-1', 'openssh-7.2p2-1-src'], + 'x86/per-version': ['.htaccess', + 'per-version-4.0-1', + 'per-version-4.0-1-src', + 'per-version-4.8-1', + 'per-version-4.8-1-src'], 'x86/perl-Net-SMTP-SSL': ['.htaccess', 'perl-Net-SMTP-SSL-1.03-1', 'perl-Net-SMTP-SSL-1.03-1-src', diff --git a/test/testdata/process_arch/rel_area.expected b/test/testdata/process_arch/rel_area.expected index d697a10..bfc4549 100644 --- a/test/testdata/process_arch/rel_area.expected +++ b/test/testdata/process_arch/rel_area.expected @@ -53,6 +53,21 @@ 'x86/release/mingw64-i686-binutils': ['setup.hint', 'sha512.sum'], 'x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo': ['setup.hint', 'sha512.sum'], 'x86/release/openssh': ['openssh-7.2p2-1-src.tar.xz', 'openssh-7.2p2-1.tar.xz', 'setup.hint', 'sha512.sum'], + 'x86/release/per-version': ['override.hint', + 'per-version-4.0-1-src.tar.xz', + 'per-version-4.0-1.hint', + 'per-version-4.0-1.tar.xz', + 'per-version-4.8-1-src.tar.xz', + 'per-version-4.8-1.hint', + 'per-version-4.8-1.tar.xz', + 'sha512.sum'], + 'x86/release/per-version-incomplete': ['override.hint', + 'per-version-incomplete-36-1-src.tar.xz', + 'per-version-incomplete-36-1.hint', + 'per-version-incomplete-36-1.tar.xz', + 'per-version-incomplete-39-1-src.tar.xz', + 'per-version-incomplete-39-1.tar.xz', + 'sha512.sum'], 'x86/release/proj': ['setup.hint', 'sha512.sum'], 'x86/release/proj/libproj-devel': ['setup.hint', 'sha512.sum'], 'x86/release/proj/libproj1': ['setup.hint', 'sha512.sum'], diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/override.hint b/test/testdata/relarea/x86/release/per-version-incomplete/override.hint new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version-incomplete/override.hint diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.tar.xz b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.tar.xz Binary files differnew file mode 100644 index 0000000..0e6f1e8 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.tar.xz diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.hint b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.hint new file mode 100644 index 0000000..db723c3 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.hint @@ -0,0 +1,3 @@ +sdesc: "Per-version hint test package" +ldesc: "Per-version hint test package with missing hint data for some versions" +category: Base diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.tar.xz b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.tar.xz Binary files differnew file mode 100644 index 0000000..0e6f1e8 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.tar.xz diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1-src.tar.xz b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1-src.tar.xz Binary files differnew file mode 100644 index 0000000..0e6f1e8 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1-src.tar.xz diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1.tar.xz b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1.tar.xz Binary files differnew file mode 100644 index 0000000..0e6f1e8 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1.tar.xz diff --git a/test/testdata/relarea/x86/release/per-version/override.hint b/test/testdata/relarea/x86/release/per-version/override.hint new file mode 100644 index 0000000..05c784e --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version/override.hint @@ -0,0 +1,2 @@ +curr: 4.8-1 + diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.tar.xz b/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.tar.xz Binary files differnew file mode 100644 index 0000000..0e6f1e8 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.tar.xz diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1.hint b/test/testdata/relarea/x86/release/per-version/per-version-4.0-1.hint new file mode 100644 index 0000000..726738d --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version/per-version-4.0-1.hint @@ -0,0 +1,4 @@ +sdesc: "Per-version hint test package" +ldesc: "Per-version hint test package" +category: Base +requires: cygwin diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1.tar.xz b/test/testdata/relarea/x86/release/per-version/per-version-4.0-1.tar.xz Binary files differnew file mode 100644 index 0000000..0e6f1e8 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version/per-version-4.0-1.tar.xz diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.tar.xz b/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.tar.xz Binary files differnew file mode 100644 index 0000000..0e6f1e8 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.tar.xz diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1.hint b/test/testdata/relarea/x86/release/per-version/per-version-4.8-1.hint new file mode 100644 index 0000000..1f86c0b --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version/per-version-4.8-1.hint @@ -0,0 +1,4 @@ +sdesc: "Per-version hint test package" +ldesc: "Per-version hint test package" +category: Base +requires: base-cygwin diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1.tar.xz b/test/testdata/relarea/x86/release/per-version/per-version-4.8-1.tar.xz Binary files differnew file mode 100644 index 0000000..0e6f1e8 --- /dev/null +++ b/test/testdata/relarea/x86/release/per-version/per-version-4.8-1.tar.xz |