From 28ec93c587dcc610125cb9aa69e51104c09f41fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Mon, 6 Aug 2018 16:12:10 +0200 Subject: [PATCH 1/3] fix: run all testcase in tests/run-tests --- tests/run-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run-tests b/tests/run-tests index d747dddf..1551f9e4 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -138,7 +138,7 @@ cd $WORKSPACE/tests/getsig ./make.sh cd $WORKSPACE/tests -for testcase in $WORKSPACE/tests/i*.TestCase; do +for testcase in $WORKSPACE/tests/*.TestCase; do if [ $testcase == $WORKSPACE/tests/install.TestCase ]; then echo "skipping install.TestCase, its too troublesome in CI builds" continue From 5d5617bf40d558438dc624a9cd4014c12f709856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Mon, 6 Aug 2018 22:13:40 +0200 Subject: [PATCH 2/3] fix: minor bugs in testcases for: common, metadata, update --- tests/common.TestCase | 4 ++-- tests/metadata/dump/com.politedroid.yaml | 2 +- tests/signatures.TestCase | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/common.TestCase b/tests/common.TestCase index f5db4f3f..b88436ea 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -822,7 +822,7 @@ class CommonTest(unittest.TestCase): '-e', 'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa', cmd[6], - 'example.com:/var/www/fdroid/repo/buildlogs'], + 'example.com:/var/www/fdroid/repo/buildlogs/'], cmd) self.assertTrue(cmd[6].endswith('/com.example.app_4711_1.log.gz')) with gzip.open(cmd[6], 'r') as f: @@ -835,7 +835,7 @@ class CommonTest(unittest.TestCase): '-e', 'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa', cmd[6], - 'example.com:/var/www/fdroid/archive/buildlogs'], + 'example.com:/var/www/fdroid/archive/buildlogs/'], cmd) self.assertTrue(cmd[6].endswith('/com.example.app_4711_1.log.gz')) with gzip.open(cmd[6], 'r') as f: diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index be2b9f43..f8ab1753 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -22,7 +22,7 @@ License: GPL-3.0-only Litecoin: null MaintainerNotes: '' Name: null -NoSourceSince: '' +NoSourceSince: '1.5' Provides: null Repo: https://github.com/miguelvps/PoliteDroid.git RepoType: git diff --git a/tests/signatures.TestCase b/tests/signatures.TestCase index 276f9144..a019da95 100755 --- a/tests/signatures.TestCase +++ b/tests/signatures.TestCase @@ -49,7 +49,9 @@ class SignaturesTest(unittest.TestCase): '99fbb3211ef5d7c1253f3a7ad4836eadc9905103ce6a75916c40de2831958284'), ) for path, checksum in filesAndHashes: - self.assertTrue(os.path.isfile(path)) + self.assertTrue(os.path.isfile(path), + msg="check whether '{path}' was extracted " + "correctly.".format(path=path)) with open(path, 'rb') as f: self.assertEqual(hashlib.sha256(f.read()).hexdigest(), checksum) From 55466f116680840a372dd22eb9f238e6e4717294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Tue, 7 Aug 2018 00:02:07 +0200 Subject: [PATCH 3/3] fix fixtures in tests/metadata/dump --- tests/metadata/dump/com.politedroid.yaml | 8 +- tests/metadata/dump/org.adaway.yaml | 54 ++++---- .../dump/org.smssecure.smssecure.yaml | 8 +- tests/metadata/dump/org.videolan.vlc.yaml | 116 +++++++++--------- 4 files changed, 93 insertions(+), 93 deletions(-) diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index f8ab1753..cc1bebbe 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -48,7 +48,7 @@ builds: buildjni: [] buildozer: false commit: 6a548e4b19 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -82,7 +82,7 @@ builds: buildjni: [] buildozer: false commit: ad865b57bf3ac59580f38485608a9b1dda4fa7dc - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -116,7 +116,7 @@ builds: buildjni: [] buildozer: false commit: 456bd615f3fbe6dff06433928cf7ea20073601fb - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -150,7 +150,7 @@ builds: buildjni: [] buildozer: false commit: v1.5 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index ac07517f..577d0449 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -69,7 +69,7 @@ builds: - 'yes' buildozer: false commit: ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -104,7 +104,7 @@ builds: - 'yes' buildozer: false commit: 4128e59da2eac5c2904c7c7568d298ca51e79540 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -140,7 +140,7 @@ builds: - 'yes' buildozer: false commit: 0b9985398b9eef7baf6aadd0dbb12002bc199d2e - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -176,7 +176,7 @@ builds: - 'yes' buildozer: false commit: ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -212,7 +212,7 @@ builds: - 'yes' buildozer: false commit: 695e3801e4081026c8f7213a2345fc451d5eb89c - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -248,7 +248,7 @@ builds: - 'yes' buildozer: false commit: 65138c11cc8b6affd28b68e125fbc1dff0886a4e - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -318,7 +318,7 @@ builds: - 'yes' buildozer: false commit: f811e53e1e1d2ee047b18715fd7d2072b90ae76b - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -353,7 +353,7 @@ builds: - 'yes' buildozer: false commit: ff97932761cdee68638dc2550751a64b2cbe18e7 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -388,7 +388,7 @@ builds: - 'yes' buildozer: false commit: 33d4d80998f30bafc88c04c80cbae00b03916f99 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -423,7 +423,7 @@ builds: - 'yes' buildozer: false commit: 743d25a7e287505461f33f4b8e57e4cf988fffea - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -458,7 +458,7 @@ builds: - 'yes' buildozer: false commit: eaa07f4 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -492,7 +492,7 @@ builds: buildjni: [] buildozer: false commit: 71ced3f - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -527,7 +527,7 @@ builds: buildjni: [] buildozer: false commit: 9d63c18 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -561,7 +561,7 @@ builds: buildjni: [] buildozer: false commit: f2568b1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -596,7 +596,7 @@ builds: buildjni: [] buildozer: false commit: 7442d5d - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -631,7 +631,7 @@ builds: buildjni: [] buildozer: false commit: 83fc713 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -666,7 +666,7 @@ builds: buildjni: [] buildozer: false commit: 70da32b567122b701cdcb1609b780eb85732028f - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -706,7 +706,7 @@ builds: - 'yes' buildozer: false commit: v2.1 - disable: false + disable: '' encoding: null extlibs: - htmlcleaner/htmlcleaner-2.2.jar @@ -753,7 +753,7 @@ builds: - 'yes' buildozer: false commit: v2.3 - disable: false + disable: '' encoding: null extlibs: - htmlcleaner/htmlcleaner-2.2.jar @@ -796,7 +796,7 @@ builds: - 'yes' buildozer: false commit: v2.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -833,7 +833,7 @@ builds: - 'yes' buildozer: false commit: v2.7 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -870,7 +870,7 @@ builds: - 'yes' buildozer: false commit: v2.8 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -907,7 +907,7 @@ builds: - 'yes' buildozer: false commit: v2.8.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -944,7 +944,7 @@ builds: - 'yes' buildozer: false commit: v2.9 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -981,7 +981,7 @@ builds: - 'yes' buildozer: false commit: v2.9.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1018,7 +1018,7 @@ builds: - 'yes' buildozer: false commit: v2.9.2 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1055,7 +1055,7 @@ builds: - 'yes' buildozer: false commit: v3.0 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index e9491640..42e59f07 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -186,7 +186,7 @@ builds: buildjni: [] buildozer: false commit: v0.5.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -259,7 +259,7 @@ builds: buildjni: [] buildozer: false commit: v0.5.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -295,7 +295,7 @@ builds: buildjni: [] buildozer: false commit: v0.5.4 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -331,7 +331,7 @@ builds: buildjni: [] buildozer: false commit: v0.6.0 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index 6009fa19..70638ad5 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -70,7 +70,7 @@ builds: buildjni: [] buildozer: false commit: 0.0.11 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -107,7 +107,7 @@ builds: buildjni: [] buildozer: false commit: 0.0.11 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -181,7 +181,7 @@ builds: buildjni: [] buildozer: false commit: 0.0.11 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -251,7 +251,7 @@ builds: buildjni: [] buildozer: false commit: 0.1.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -287,7 +287,7 @@ builds: buildjni: [] buildozer: false commit: 0.1.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -323,7 +323,7 @@ builds: buildjni: [] buildozer: false commit: 0.1.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -359,7 +359,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.0 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -394,7 +394,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.0 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -429,7 +429,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -464,7 +464,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -569,7 +569,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -604,7 +604,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -639,7 +639,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.7 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -674,7 +674,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.7 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -744,7 +744,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.7.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -779,7 +779,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.7.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -814,7 +814,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.8 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -849,7 +849,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.8 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -884,7 +884,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.8 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -919,7 +919,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.9 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -954,7 +954,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.9 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -989,7 +989,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.9 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -1024,7 +1024,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.10 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -1059,7 +1059,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.10 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -1094,7 +1094,7 @@ builds: buildjni: [] buildozer: false commit: 0.9.10 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -1234,7 +1234,7 @@ builds: buildjni: [] buildozer: false commit: 1.0.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -1269,7 +1269,7 @@ builds: buildjni: [] buildozer: false commit: 1.0.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -1304,7 +1304,7 @@ builds: buildjni: [] buildozer: false commit: 1.0.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: true @@ -1339,7 +1339,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1376,7 +1376,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1413,7 +1413,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1450,7 +1450,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.5 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1487,7 +1487,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.5 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1524,7 +1524,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.5 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1561,7 +1561,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1598,7 +1598,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1635,7 +1635,7 @@ builds: buildjni: [] buildozer: false commit: 1.1.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1672,7 +1672,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.0 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1709,7 +1709,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.0 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1746,7 +1746,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.0 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1783,7 +1783,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1820,7 +1820,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1857,7 +1857,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.1 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1894,7 +1894,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.2 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1931,7 +1931,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.2 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -1968,7 +1968,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.2 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2005,7 +2005,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2042,7 +2042,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2079,7 +2079,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.3 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2116,7 +2116,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.4 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2153,7 +2153,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.4 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2190,7 +2190,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.4 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2227,7 +2227,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.5 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2264,7 +2264,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.5 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2301,7 +2301,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.5 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2338,7 +2338,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2375,7 +2375,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false @@ -2412,7 +2412,7 @@ builds: buildjni: [] buildozer: false commit: 1.2.6 - disable: false + disable: '' encoding: null extlibs: [] forcevercode: false