kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-07 10:55:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1409 from hashicorp/f-client-lost-state

Browse Source 
Skipping travis tests and not installing rkt on travis
This commit is contained in:
Sean Chittenden
2016-07-11 17:52:38 -04:00
committed by GitHub
parent 8e8f2c1378 cab0d3eea7
commit b0fa994692
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
GNUmakefile
View File

@@ -77,6 +77,5 @@ install: bin/nomad
travis:
@sudo apt-get install -y qemu
@sh -c "'$(PWD)/scripts/update_docker.sh'"
@sh -c "'$(PWD)/scripts/install_rkt.sh'"
.PHONY: all bin cov integ test vet web web-push test-nodep

29
client/driver/rkt_test.go
View File

@@ -3,6 +3,7 @@ package driver
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"reflect"
"strings"
@@ -18,6 +19,10 @@ import (
)
func TestRktVersionRegex(t *testing.T) {
if os.Getenv("NOMAD_TEST_RKT") == "" {
t.Skip("skipping rkt tests")
}
input_rkt := "rkt version 0.8.1"
input_appc := "appc version 1.2.0"
expected_rkt := "0.8.1"
@@ -34,6 +39,10 @@ func TestRktVersionRegex(t *testing.T) {
// The fingerprinter test should always pass, even if rkt is not installed.
func TestRktDriver_Fingerprint(t *testing.T) {
if os.Getenv("NOMAD_TEST_RKT") == "" {
t.Skip("skipping rkt tests")
}
ctestutils.RktCompatible(t)
driverCtx, _ := testDriverContexts(&structs.Task{Name: "foo"})
d := NewRktDriver(driverCtx)
@@ -59,6 +68,10 @@ func TestRktDriver_Fingerprint(t *testing.T) {
}
func TestRktDriver_Start_DNS(t *testing.T) {
if os.Getenv("NOMAD_TEST_RKT") == "" {
t.Skip("skipping rkt tests")
}
ctestutils.RktCompatible(t)
// TODO: use test server to load from a fixture
task := &structs.Task{
@@ -105,6 +118,10 @@ func TestRktDriver_Start_DNS(t *testing.T) {
}
func TestRktDriver_Start_Wait(t *testing.T) {
if os.Getenv("NOMAD_TEST_RKT") == "" {
t.Skip("skipping rkt tests")
}
ctestutils.RktCompatible(t)
task := &structs.Task{
Name: "etcd",
@@ -154,6 +171,10 @@ func TestRktDriver_Start_Wait(t *testing.T) {
}
func TestRktDriver_Start_Wait_Skip_Trust(t *testing.T) {
if os.Getenv("NOMAD_TEST_RKT") == "" {
t.Skip("skipping rkt tests")
}
ctestutils.RktCompatible(t)
task := &structs.Task{
Name: "etcd",
@@ -202,6 +223,10 @@ func TestRktDriver_Start_Wait_Skip_Trust(t *testing.T) {
}
func TestRktDriver_Start_Wait_AllocDir(t *testing.T) {
if os.Getenv("NOMAD_TEST_RKT") == "" {
t.Skip("skipping rkt tests")
}
ctestutils.RktCompatible(t)
exp := []byte{'w', 'i', 'n'}
@@ -262,6 +287,10 @@ func TestRktDriver_Start_Wait_AllocDir(t *testing.T) {
}
func TestRktDriverUser(t *testing.T) {
if os.Getenv("NOMAD_TEST_RKT") == "" {
t.Skip("skipping rkt tests")
}
ctestutils.RktCompatible(t)
task := &structs.Task{
Name: "etcd",