summaryrefslogtreecommitdiffhomepage
path: root/runsc/container/container_test.go
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2020-09-17 01:07:55 -0700
committergVisor bot <gvisor-bot@google.com>2020-09-17 01:09:42 -0700
commita11061d78a58ed75b10606d1a770b035ed944b66 (patch)
tree1bdb322be294cdd868d4bf36a1520e0517021d60 /runsc/container/container_test.go
parentae59e529791e4763aaa25eee818605f17699fc67 (diff)
Add VFS2 overlay support in runsc
All tests under runsc are passing with overlay enabled. Updates #1487, #1199 PiperOrigin-RevId: 332181267
Diffstat (limited to 'runsc/container/container_test.go')
-rw-r--r--runsc/container/container_test.go18
1 files changed, 4 insertions, 14 deletions
diff --git a/runsc/container/container_test.go b/runsc/container/container_test.go
index ad49f8b16..ff0e60283 100644
--- a/runsc/container/container_test.go
+++ b/runsc/container/container_test.go
@@ -317,22 +317,12 @@ func configs(t *testing.T, opts ...configOption) map[string]*config.Config {
}
func configsWithVFS2(t *testing.T, opts ...configOption) map[string]*config.Config {
- vfs1 := configs(t, opts...)
-
- var optsVFS2 []configOption
- for _, opt := range opts {
- // TODO(gvisor.dev/issue/1487): Enable overlay tests.
- if opt != overlay {
- optsVFS2 = append(optsVFS2, opt)
- }
- }
-
- for key, value := range configs(t, optsVFS2...) {
+ all := configs(t, opts...)
+ for key, value := range configs(t, opts...) {
value.VFS2 = true
- vfs1[key+"VFS2"] = value
+ all[key+"VFS2"] = value
}
-
- return vfs1
+ return all
}
// TestLifecycle tests the basic Create/Start/Signal/Destroy container lifecycle.