From 08bc5ac9344ae03f7852c807b46cf87925778c3f Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 22 Sep 2015 12:40:42 +0300 Subject: [PATCH] Fix system tests for Go 1.5. Some error strings in Go 1.5 have changed. Until we have something better for that, use string replace. --- system/t04_mirror/create.py | 1 + system/t09_repo/include.py | 1 + 2 files changed, 2 insertions(+) diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 6357fda6..57b6f29f 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -231,6 +231,7 @@ class CreateMirror20Test(BaseTest): create mirror: using failing HTTP_PROXY """ fixtureGpg = True + outputMatchPrepare = lambda _, s: s.replace('getsockopt: ', '') runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror20 http://security.debian.org/ wheezy/updates main" environmentOverride = {"HTTP_PROXY": "127.0.0.1:3137"} diff --git a/system/t09_repo/include.py b/system/t09_repo/include.py index 36eb0841..3f7aeabb 100644 --- a/system/t09_repo/include.py +++ b/system/t09_repo/include.py @@ -59,6 +59,7 @@ class IncludeRepo3Test(BaseTest): ] runCmd = "aptly repo include -no-remove-files -keyring=${files}/aptly.pub -repo=my-{{.Distribution} ${changes}" expectedCode = 1 + outputMatchPrepare = lambda _, s: s.replace('; missing space?', '') class IncludeRepo4Test(BaseTest):