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.
This commit is contained in:
Andrey Smirnov
2015-09-22 12:40:42 +03:00
parent c160cbccc7
commit 08bc5ac934
2 changed files with 2 additions and 0 deletions
+1
View File
@@ -231,6 +231,7 @@ class CreateMirror20Test(BaseTest):
create mirror: using failing HTTP_PROXY create mirror: using failing HTTP_PROXY
""" """
fixtureGpg = True 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" 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"} environmentOverride = {"HTTP_PROXY": "127.0.0.1:3137"}
+1
View File
@@ -59,6 +59,7 @@ class IncludeRepo3Test(BaseTest):
] ]
runCmd = "aptly repo include -no-remove-files -keyring=${files}/aptly.pub -repo=my-{{.Distribution} ${changes}" runCmd = "aptly repo include -no-remove-files -keyring=${files}/aptly.pub -repo=my-{{.Distribution} ${changes}"
expectedCode = 1 expectedCode = 1
outputMatchPrepare = lambda _, s: s.replace('; missing space?', '')
class IncludeRepo4Test(BaseTest): class IncludeRepo4Test(BaseTest):