diff options
author | Zach Koopmans <zkoopmans@google.com> | 2020-07-08 13:24:58 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-07-08 13:26:23 -0700 |
commit | f3fa43cf237109c1e1cb0cf7ba63bb793cc2ff1f (patch) | |
tree | 34401d90d4d4e892020a11baf37311c1ec20aaa6 /test/e2e/regression_test.go | |
parent | e1f11dea286789ffa116e357bea66ee6b422deae (diff) |
Move all tests to new docker API.
Moves following to new dockerutil API:
- //test/e2e:integration_test
- //test/image:image_test
- //test/iptables:iptables_test
- //test/root:root_test
- //test/packetimpact:packetimpact_test
PiperOrigin-RevId: 320253118
Diffstat (limited to 'test/e2e/regression_test.go')
-rw-r--r-- | test/e2e/regression_test.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/e2e/regression_test.go b/test/e2e/regression_test.go index 327a2174c..70bbe5121 100644 --- a/test/e2e/regression_test.go +++ b/test/e2e/regression_test.go @@ -15,6 +15,7 @@ package integration import ( + "context" "strings" "testing" @@ -27,11 +28,12 @@ import ( // Prerequisite: the directory where the socket file is created must not have // been open for write before bind(2) is called. func TestBindOverlay(t *testing.T) { - d := dockerutil.MakeDocker(t) - defer d.CleanUp() + ctx := context.Background() + d := dockerutil.MakeContainer(ctx, t) + defer d.CleanUp(ctx) // Run the container. - got, err := d.Run(dockerutil.RunOpts{ + got, err := d.Run(ctx, dockerutil.RunOpts{ Image: "basic/ubuntu", }, "bash", "-c", "nc -l -U /var/run/sock & p=$! && sleep 1 && echo foobar-asdf | nc -U /var/run/sock && wait $p") if err != nil { |