From 69cbe106903e677b230c505213b4aab3fbf0f5ae Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 16 Mar 2017 01:31:17 +0300 Subject: [PATCH 1/2] Add Travis CI build on Go 1.8 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 08ed8ff1..20a3362b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ language: go go: - 1.6 - 1.7 + - 1.8 - tip addons: From b1025624782dcf974c4c3353222632028f4c2f31 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 16 Mar 2017 20:58:21 +0300 Subject: [PATCH 2/2] Fix up system test for Go 1.8 --- system/t04_mirror/create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 5ebdfeff..5f8b400c 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -231,7 +231,7 @@ class CreateMirror20Test(BaseTest): create mirror: using failing HTTP_PROXY """ fixtureGpg = True - outputMatchPrepare = lambda _, s: s.replace('getsockopt: ', '') + outputMatchPrepare = lambda _, s: s.replace('getsockopt: ', '').replace('proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137') 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"}