luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Added client checks back to the tests that can't use dockerSetup()

Browse source
This commit is contained in:
Chris Bednarski 2015-11-20 13:50:47 -08:00
parent dd8c9c28f8
commit 10bb550ad8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/driver/docker_test.go
View file

@ -153,6 +153,10 @@ func TestDockerDriver_Fingerprint(t *testing.T) {
}
func TestDockerDriver_StartOpen_Wait(t *testing.T) {
if !dockerIsConnected(t) {
t.SkipNow()
}
task := &structs.Task{
Name: "redis-demo",
Config: map[string]interface{}{
@ -222,7 +226,7 @@ func TestDockerDriver_Start_Wait_AllocDir(t *testing.T) {
// This test requires that the alloc dir be mounted into docker as a volume.
// Because this cannot happen when docker is run remotely, e.g. when running
// docker in a VM, we skip this when we detect Docker is being run remotely.
if dockerIsRemote(t) {
if !dockerIsConnected(t) || dockerIsRemote(t) {
t.SkipNow()
}