From b3b01689707ae685e5eebf2310b0052edd08502c Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 19 Feb 2020 18:58:43 +0000 Subject: Extend test to cover hint adjustment at upload --- .../release/testpackage/testpackage-1.0-1-src.tar.bz2 | Bin 195 -> 266 bytes test/testdata/process_arch/homedir.expected | 2 +- test/testdata/process_arch/packages.json.expected | 1 + test/testdata/process_arch/setup.ini.expected | 8 ++++---- test/testdata/uploads/pkglist.expected | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 index a1145fb..495f0ad 100644 Binary files a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 and b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 differ diff --git a/test/testdata/process_arch/homedir.expected b/test/testdata/process_arch/homedir.expected index 8b90c99..42e9902 100644 --- a/test/testdata/process_arch/homedir.expected +++ b/test/testdata/process_arch/homedir.expected @@ -12,7 +12,7 @@ '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-1.0-1-src.hint.bak'], 'Blooey McFooey/x86/release/testpackage/testpackage-subpackage': [], 'Blooey McFooey/x86/release/testpackage2': ['setup.hint', 'testpackage2-1.0-1.tar.bz2'], 'Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage': ['inprogress.SftpXFR.1234', diff --git a/test/testdata/process_arch/packages.json.expected b/test/testdata/process_arch/packages.json.expected index 169ba7c..d5c0a9b 100644 --- a/test/testdata/process_arch/packages.json.expected +++ b/test/testdata/process_arch/packages.json.expected @@ -408,6 +408,7 @@ ' "arches": [\n' ' "x86"\n' ' ],\n' + ' "homepage": "http://homepage.url",\n' ' "maintainers": [\n' ' "Blooey McFooey"\n' ' ],\n' diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected index e64b7de..e150e61 100644 --- a/test/testdata/process_arch/setup.ini.expected +++ b/test/testdata/process_arch/setup.ini.expected @@ -363,8 +363,8 @@ 'version: 1.0-1\n' 'install: x86/release/testpackage/testpackage-1.0-1.tar.bz2 195 ' 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n' - 'source: x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 195 ' - 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n' + 'source: x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 266 ' + 'acfd77df3347e6432ccf29c12989964bc680a158d574f85dfa7ef222759f411006c7bd2773e37c5abdee628bea769b2da9aae213db615cd91402fd385373933d\n' 'depends2: cygwin\n' '\n' '@ testpackage-subpackage\n' @@ -374,5 +374,5 @@ 'version: 1.0-1\n' 'install: x86/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2 195 ' 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n' - 'source: x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 195 ' - 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n',) + 'source: x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 266 ' + 'acfd77df3347e6432ccf29c12989964bc680a158d574f85dfa7ef222759f411006c7bd2773e37c5abdee628bea769b2da9aae213db615cd91402fd385373933d\n',) diff --git a/test/testdata/uploads/pkglist.expected b/test/testdata/uploads/pkglist.expected index a928e8d..99cdd09 100644 --- a/test/testdata/uploads/pkglist.expected +++ b/test/testdata/uploads/pkglist.expected @@ -6,13 +6,14 @@ 'category': 'Devel', 'requires': 'cygwin', 'depends': 'cygwin'}}, {}, False), - 'testpackage-src': Package('testpackage', {'1.0-1': {'testpackage-1.0-1-src.tar.bz2': Tar('testpackage-1.0-1-src.tar.bz2', 'x86/release/testpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}}, {'1.0-1': {'sdesc': '"A test package"', + 'testpackage-src': Package('testpackage', {'1.0-1': {'testpackage-1.0-1-src.tar.bz2': Tar('testpackage-1.0-1-src.tar.bz2', 'x86/release/testpackage', 'acfd77df3347e6432ccf29c12989964bc680a158d574f85dfa7ef222759f411006c7bd2773e37c5abdee628bea769b2da9aae213db615cd91402fd385373933d', 266, False)}}, {'1.0-1': {'sdesc': '"A test package"', 'ldesc': '"A test package\n' "It's description might contains some unicode junk\n" 'Like it’s you’re Markup Language™ Nokogiri’s tool―that ' 'Bézier."', 'category': 'Devel', 'requires': 'cygwin', + 'homepage': 'http://homepage.url', 'depends': 'cygwin'}}, {}, True), 'testpackage-subpackage': Package('testpackage/testpackage-subpackage', {'1.0-1': {'testpackage-subpackage-1.0-1.tar.bz2': Tar('testpackage-subpackage-1.0-1.tar.bz2', 'x86/release/testpackage/testpackage-subpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}}, {'1.0-1': {'sdesc': '"A test subpackage"', 'ldesc': '"A test subpackage"', -- cgit v1.2.3