Add a test for uploading just a replacement pvr.hint file

author: Jon Turney <jon.turney@dronecode.org.uk> 2016-12-09 15:36:12 +0300
committer: Jon Turney <jon.turney@dronecode.org.uk> 2016-12-09 16:03:39 +0300
commit: f3e0b64f40dc1a29e138295ffba136eccc019df2 (patch)
tree: e8649271885f368945a7fa254d52cfe5c623fd36
parent: 6c45ddb6e7be36a836b52b16dd156d76fac3aca6 (diff)
16 files changed, 60 insertions, 2 deletions
diff --git a/test/test_calm.py b/test/test_calm.py
index 84124bd..b0e725d 100755
--- a/test/test_calm.py
+++ b/test/test_calm.py
@@ -264,7 +264,8 @@ class CalmTest(unittest.TestCase):
                      (os.path.join(m_homedir, 'x86', 'release', 'after-ready', '!ready'), '-t 198709011700'),
                      (os.path.join(m_homedir, 'noarch', 'release', 'perl-Net-SMTP-SSL', '!ready'), ''),
                      (os.path.join(m_homedir, 'x86', 'release', 'corrupt', '!ready'), ''),
-                     (os.path.join(m_homedir, 'x86', 'release', 'per-version', '!ready'), '')]
+                     (os.path.join(m_homedir, 'x86', 'release', 'per-version', '!ready'), ''),
+                     (os.path.join(m_homedir, 'x86', 'release', 'per-version-replacement-hint-only', '!ready'), '')]
         for (f, t) in ready_fns:
             os.system('touch %s "%s"' % (t, f))
 
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint b/test/testdata/homes/Blooey McFooey/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
new file mode 100644
index 0000000..fbc7159
--- /dev/null
+++ b/test/testdata/homes/Blooey McFooey/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
@@ -0,0 +1,4 @@
+sdesc: "Replacement per-version hint test package - updated"
+ldesc: "Replacement per-version hint test package - updated"
+category: Base
+requires: base-cygwin per-version
diff --git a/test/testdata/htdocs.expected/x86/packages.inc b/test/testdata/htdocs.expected/x86/packages.inc
index 54fc736..1f443bd 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/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/per-version-replacement-hint-only">per-version-replacement-hint-only</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/staleversion">staleversion</a></td><td>Test package for stale version removal</td></tr>
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess
new file mode 100644
index 0000000..3196d64
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.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-replacement-hint-only/per-version-replacement-hint-only-1.0-1 b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1
new file mode 100644
index 0000000..86c5135
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1
@@ -0,0 +1,7 @@
+<html>
+<h1>per-version-replacement-hint-only: 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-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src
new file mode 100644
index 0000000..969236e
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src
@@ -0,0 +1,7 @@
+<html>
+<h1>per-version-replacement-hint-only: 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 d770582..ea351c1 100644
--- a/test/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
@@ -209,6 +209,17 @@
  'source: x86/release/per-version/per-version-4.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
+ '@ per-version-replacement-hint-only\n'
+ 'sdesc: "Per-version hint test package"\n'
+ 'ldesc: "Per-version hint test package"\n'
+ 'category: Base\n'
+ 'requires: cygwin\n'
+ 'version: 1.0-1\n'
+ 'install: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
+ 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
+ 'source: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.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 6067d55..9239bdc 100644
--- a/test/testdata/pkglist/cygwin-pkg-maint
+++ b/test/testdata/pkglist/cygwin-pkg-maint
@@ -1703,6 +1703,7 @@ perl-YAML                                    Achim Gratz/Yaakov Selkowitz
 perl-YAML-LibYAML                            Achim Gratz
 per-version                                  Blooey McFooey
 per-version-incomplete                       Blooey McFooey
+per-version-replacement-hint-only            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 0610a6c..a43eb13 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', 'per-version', 'per-version-incomplete', 'staleversion', 'testpackage']),
+ 'Blooey McFooey': maintainers.Maintainer('Blooey McFooey', [], ['corrupt', 'perl-Net-SMTP-SSL', 'per-version', 'per-version-incomplete', 'per-version-replacement-hint-only', 'staleversion', '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/homedir.expected b/test/testdata/process_arch/homedir.expected
index e680cec..2f825f1 100644
--- a/test/testdata/process_arch/homedir.expected
+++ b/test/testdata/process_arch/homedir.expected
@@ -11,6 +11,7 @@
  'Blooey McFooey/x86/release/not-on-package-list': ['not-on-package-list-1.0-1.tar.bz2', 'setup.hint'],
  'Blooey McFooey/x86/release/not-ready': ['-not-ready-0.9-1.tar.bz2', 'not-ready-1.0-1.tar.bz2', 'setup.hint'],
  'Blooey McFooey/x86/release/per-version': [],
+ 'Blooey McFooey/x86/release/per-version-replacement-hint-only': [],
  'Blooey McFooey/x86/release/testpackage': [],
  'Blooey McFooey/x86/release/testpackage/testpackage-subpackage': [],
  'Blooey McFooey/x86/release/testpackage2': ['setup.hint', 'testpackage2-1.0-1.tar.bz2'],
diff --git a/test/testdata/process_arch/htdocs.expected b/test/testdata/process_arch/htdocs.expected
index 3dd3b28..235021c 100644
--- a/test/testdata/process_arch/htdocs.expected
+++ b/test/testdata/process_arch/htdocs.expected
@@ -27,6 +27,9 @@
                      'per-version-4.8-1-src',
                      'per-version-5.0-1',
                      'per-version-5.0-1-src'],
+ 'x86/per-version-replacement-hint-only': ['.htaccess',
+                                           'per-version-replacement-hint-only-1.0-1',
+                                           'per-version-replacement-hint-only-1.0-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 67d9b4c..51f4a24 100644
--- a/test/testdata/process_arch/rel_area.expected
+++ b/test/testdata/process_arch/rel_area.expected
@@ -71,6 +71,10 @@
                                         'per-version-incomplete-39-1-src.tar.xz',
                                         'per-version-incomplete-39-1.tar.xz',
                                         'sha512.sum'],
+ 'x86/release/per-version-replacement-hint-only': ['per-version-replacement-hint-only-1.0-1-src.tar.xz',
+                                                   'per-version-replacement-hint-only-1.0-1.hint',
+                                                   'per-version-replacement-hint-only-1.0-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/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index 2fd7bcb..d959734 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -215,6 +215,17 @@
  'source: x86/release/per-version/per-version-5.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
+ '@ per-version-replacement-hint-only\n'
+ 'sdesc: "Replacement per-version hint test package - updated"\n'
+ 'ldesc: "Replacement per-version hint test package - updated"\n'
+ 'category: Base\n'
+ 'requires: base-cygwin per-version\n'
+ 'version: 1.0-1\n'
+ 'install: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
+ 'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
+ 'source: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.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/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz b/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz
new file mode 100644
index 0000000..0e6f1e8
--- /dev/null
+++ b/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint b/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
new file mode 100644
index 0000000..726738d
--- /dev/null
+++ b/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.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-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz b/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz
new file mode 100644
index 0000000..0e6f1e8
--- /dev/null
+++ b/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz
author	Jon Turney <jon.turney@dronecode.org.uk>	2016-12-09 15:36:12 +0300
committer	Jon Turney <jon.turney@dronecode.org.uk>	2016-12-09 16:03:39 +0300
commit	f3e0b64f40dc1a29e138295ffba136eccc019df2 (patch)
tree	e8649271885f368945a7fa254d52cfe5c623fd36
parent	6c45ddb6e7be36a836b52b16dd156d76fac3aca6 (diff)