From 44c93e359802ac4d5dacfea3aa83979738c8569f Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Tue, 12 May 2020 11:17:58 -0400 Subject: [PATCH] update tests --- drivers/docker/driver_test.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go index 5ccd44057..deb3d4b2a 100644 --- a/drivers/docker/driver_test.go +++ b/drivers/docker/driver_test.go @@ -1135,7 +1135,7 @@ func TestDockerDriver_CreateContainerConfig_ChecksAllowRuntimes(t *testing.T) { cfg.Runtime = "denied" _, err := driver.createContainerConfig(task, cfg, "org/repo:0.1") require.Error(t, err) - require.Contains(t, err.Error(), "runtime is not allowed") + require.Contains(t, err.Error(), `runtime "denied" is not allowed`) }) } @@ -1275,12 +1275,6 @@ func TestDockerDriver_CreateContainerConfigWithRuntimes(t *testing.T) { if !tu.IsCI() { t.Parallel() } - if !testutil.DockerIsConnected(t) { - t.Skip("Docker not connected") - } - if runtime.GOOS != "linux" { - t.Skip("nvidia plugin supports only linux") - } testCases := []struct { description string gpuRuntimeSet bool @@ -1322,7 +1316,9 @@ func TestDockerDriver_CreateContainerConfigWithRuntimes(t *testing.T) { task, cfg, ports := dockerTask(t) defer freeport.Return(ports) - dh := dockerDriverHarness(t, nil) + dh := dockerDriverHarness(t, map[string]interface{}{ + "allow_runtimes": []string{"runc", "nvidia", "nvidia-runtime-modified-name"}, + }) driver := dh.Impl().(*Driver) driver.gpuRuntime = testCase.gpuRuntimeSet