Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try moving to newer Travis-CI infrastructure #1141

Merged
merged 2 commits into from
Jul 28, 2015
Merged

Try moving to newer Travis-CI infrastructure #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad7a53
travis-ci: use newer build infra
ryanuber Jul 28, 2015
40f3e3f
travis-ci: skip syslog tests for container-based travis infra
ryanuber Jul 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
language: go

go:
- tip
- tip

branches:
only:
- master

install: make deps
script:
- make test
- make test

sudo: false
7 changes: 6 additions & 1 deletion command/agent/syslog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package agent

import (
"os"
"runtime"
"testing"

Expand All @@ -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)
Expand Down