Merge lp:~jonas-drange/ubuntu-push/disable-logger-test-on-gccgo into lp:ubuntu-push

[Jonas G. Drange]

disable logger tests that expect log.Lshortfile on ppc/arm 64

Seems gccgo produces the wrong output for log.lshortfile. Since this issue [1] is wontfix and we're asked to upgrade, let's skip the test if it produces this erroneous (?) output.

Regexp test case:
https://play.golang.org/p/C3tgD9hI9I

[1] https://github.com/golang/go/issues/16406

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:164
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/14/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/989/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/989
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/891/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/891/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/891/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-push/disable-logger-test-on-gccgo]

165. By Jonas G. Drange on 2016-07-18

be less greedy

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:165
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/990/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/990
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/892/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/892/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/892/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'logger/logger_test.go'
--- logger/logger_test.go	2015-02-06 13:55:33 +0000
+++ logger/logger_test.go	2016-07-18 11:12:34 +0000
@@ -21,6 +21,7 @@
 	"fmt"
 	"log"
 	"os"
+	"regexp"
 	"runtime"
 	"testing"
 
@@ -138,7 +139,18 @@
 	logger := NewSimpleLoggerFromMinimalLogger(baselog, "error")
 	baselog.Output(1, "foobar")
 	logger.Output(1, "foobaz")
-	c.Check(buf.String(), Matches, "logger_test.go:[0-9]+: foobar\nlogger_test.go:[0-9]+: foobaz\n")
+
+
+	out := buf.String()
+
+	/* Workaround for https://github.com/golang/go/issues/16406 which is
+	wontfix with a comment about a need to upgrade. */
+	re := regexp.MustCompile(".*linux64\\.S.*|.*sysv\\.S.*")
+	if re.MatchString(out) {
+		c.Skip("log.Lshortfile failed to provide the expected output")
+	}
+
+	c.Check(out, Matches, "logger_test.go:[0-9]+: foobar\nlogger_test.go:[0-9]+: foobaz\n")
 }
 
 type testLogLevelConfig struct {
@@ -168,7 +180,16 @@
 	buf := &bytes.Buffer{}
 	logger := NewSimpleLogger(buf, "debug")
 	logger.Output(1, "foobaz")
-	c.Check(buf.String(), Matches, ".* .* logger_test.go:[0-9]+: foobaz\n")
+
+	out := buf.String()
+
+	/* Workaround for https://github.com/golang/go/issues/16406 which is
+	wontfix with a comment about a need to upgrade. */
+	re := regexp.MustCompile(".*linux64\\.S.*|.*sysv\\.S.*")
+	if re.MatchString(out) {
+		c.Skip("log.Lshortfile failed to provide the expected output")
+	}
+	c.Check(out, Matches, ".* .* logger_test.go:[0-9]+: foobaz\n")
 
 	buf.Reset()
 	logger = NewSimpleLogger(buf, "error")