luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #1141 from hashicorp/f-travis 

Try moving to newer Travis-CI infrastructure
This commit is contained in:
Ryan Uber 2015-07-28 10:42:56 -07:00
parent 8f321ca0ba f48bc65e62
commit 6e38497ce9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -1,7 +1,7 @@
language: go language: go
go: go:
- tip - tip
branches: branches:
only: only:
@ -9,4 +9,6 @@ branches:
install: make deps install: make deps
script: script:
- make test - make test
sudo: false

7
command/agent/syslog_test.go
View File

@ -1,6 +1,7 @@
package agent package agent
import ( import (
"os"
"runtime" "runtime"
"testing" "testing"
@ -10,8 +11,12 @@ import (
func TestSyslogFilter(t *testing.T) { func TestSyslogFilter(t *testing.T) {
if runtime.GOOS == "windows" { 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") l, err := gsyslog.NewLogger(gsyslog.LOG_NOTICE, "LOCAL0", "consul")
if err != nil { if err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)