20755: Merge branch 'main' into 20755-ec2-multiple-subnets

[arvados.git] / lib / crunchrun / executor_test.go

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index e757f579fe957eff333892c2fc7a12de9fff82e2..f1a873ae8dcc9b86d79ddc0170c8a44743f8dd81 100644 (file)
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -6,6 +6,7 @@ package crunchrun
 
 import (
        "bytes"
+       "context"
        "fmt"
        "io"
        "io/ioutil"
@@ -18,7 +19,6 @@ import (
        "git.arvados.org/arvados.git/lib/diagnostics"
        "git.arvados.org/arvados.git/sdk/go/arvados"
        "git.arvados.org/arvados.git/sdk/go/arvadostest"
-       "golang.org/x/net/context"
        . "gopkg.in/check.v1"
 )