diff --git a/client/driver/qemu_test.go b/client/driver/qemu_test.go index c81744d9f60..83f4a29df29 100644 --- a/client/driver/qemu_test.go +++ b/client/driver/qemu_test.go @@ -125,12 +125,14 @@ func TestQemuDriver_StartOpen_Wait(t *testing.T) { } func TestQemuDriver_GracefulShutdown(t *testing.T) { - logger := testLogger() + testutil.SkipSlow(t) if !testutil.IsTravis() { t.Parallel() } ctestutils.QemuCompatible(t) + logger := testLogger() + // Graceful shutdown may be really slow unfortunately killTimeout := 3 * time.Minute diff --git a/scripts/travis.sh b/scripts/travis.sh index 8e500f79378..541bbb587e6 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -14,7 +14,7 @@ if [ "$RUN_STATIC_CHECKS" ]; then fi fi -make test +NOMAD_SLOW_TEST=1 make test TEST_OUTPUT=$? kill $PING_LOOP_PID diff --git a/testutil/slow.go b/testutil/slow.go new file mode 100644 index 00000000000..1a80880245e --- /dev/null +++ b/testutil/slow.go @@ -0,0 +1,15 @@ +package testutil + +import ( + "os" + + testing "github.com/mitchellh/go-testing-interface" +) + +// SkipSlow skips a slow test unless the NOMAD_SLOW_TEST environment variable +// is set. +func SkipSlow(t testing.T) { + if os.Getenv("NOMAD_SLOW_TEST") == "" { + t.Skip("Skipping slow test. Set NOMAD_SLOW_TEST=1 to run.") + } +}