Delete containers inside the test

kzys · kzys · commit ccb6a94ecc8a · 2020-02-18T16:45:48.000-08:00
Signed-off-by: Kazuyoshi Kato &lt;katokazu@amazon.com&gt;
diff --git a/runtime/service_integ_test.go b/runtime/service_integ_test.go
@@ -269,10 +269,6 @@ func TestMultipleVMs_Isolated(t *testing.T) {
 	}
 	m := testing.MainStart(runner, tests, nil, nil)
 	code := m.Run()
-	for _, container := range runner.containers {
-		err := container.Delete(context.Background())
-		t.Log(err)
-	}
 
 	os.Exit(code)
 }
@@ -454,6 +450,8 @@ func (runner *testMultipleVMsRunner) testMultipleExecs(
 			firecrackeroci.WithVMID(vmIDStr),
 		),
 	)
+	defer newContainer.Delete(ctx)
+
 	require.NoError(t, err, "failed to create container %s", containerName)
 	runner.containers = append(runner.containers, newContainer)
 

Original file line number	Diff line number	Diff line change
`@@ -269,10 +269,6 @@ func TestMultipleVMs_Isolated(t *testing.T) {`
`269`	`269`	`}`
`270`	`270`	`m := testing.MainStart(runner, tests, nil, nil)`
`271`	`271`	`code := m.Run()`
`272`		`- for _, container := range runner.containers {`
`273`		`- err := container.Delete(context.Background())`
`274`		`- t.Log(err)`
`275`		`- }`
`276`	`272`
`277`	`273`	`os.Exit(code)`
`278`	`274`	`}`
`@@ -454,6 +450,8 @@ func (runner *testMultipleVMsRunner) testMultipleExecs(`
`454`	`450`	`firecrackeroci.WithVMID(vmIDStr),`
`455`	`451`	`),`
`456`	`452`	`)`
	`453`	`+ defer newContainer.Delete(ctx)`
	`454`	`+`
`457`	`455`	`require.NoError(t, err, "failed to create container %s", containerName)`
`458`	`456`	`runner.containers = append(runner.containers, newContainer)`
`459`	`457`