From 3ad7a53095900919e9e466fc003f0ed06526eb5b Mon Sep 17 00:00:00 2001 From: Ryan Uber Date: Tue, 28 Jul 2015 09:13:25 -0700 Subject: [PATCH 1/2] travis-ci: use newer build infra --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89b2672396..257c3fa62e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - tip + - tip branches: only: @@ -9,4 +9,6 @@ branches: install: make deps script: - - make test + - make test + +sudo: false From 40f3e3fae7ef13a8de56c57154b2aa381e9291cf Mon Sep 17 00:00:00 2001 From: Ryan Uber Date: Tue, 28 Jul 2015 09:34:24 -0700 Subject: [PATCH 2/2] travis-ci: skip syslog tests for container-based travis infra --- command/agent/syslog_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/command/agent/syslog_test.go b/command/agent/syslog_test.go index 7075703195..0990a081d8 100644 --- a/command/agent/syslog_test.go +++ b/command/agent/syslog_test.go @@ -1,6 +1,7 @@ package agent import ( + "os" "runtime" "testing" @@ -10,8 +11,12 @@ import ( func TestSyslogFilter(t *testing.T) { if runtime.GOOS == "windows" { - t.SkipNow() + t.Skip("Syslog not supported on Windows") } + if os.Getenv("TRAVIS") == "true" { + t.Skip("Syslog not supported on travis-ci") + } + l, err := gsyslog.NewLogger(gsyslog.LOG_NOTICE, "LOCAL0", "consul") if err != nil { t.Fatalf("err: %s", err)