summaryrefslogtreecommitdiffhomepage
path: root/runsc/test/testutil
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2018-10-01 10:29:45 -0700
committerShentubot <shentubot@google.com>2018-10-01 10:31:17 -0700
commita2ad8fef136b31989bfcd2f40003f6113aebaf1d (patch)
tree687966350701e0dc96440699cd32c79266e6bb75 /runsc/test/testutil
parent43e6aff50e23763d12c71b054f100fd91da46736 (diff)
Make multi-container the default mode for runsc
And remove multicontainer option. PiperOrigin-RevId: 215236981 Change-Id: I9fd1d963d987e421e63d5817f91a25c819ced6cb
Diffstat (limited to 'runsc/test/testutil')
-rw-r--r--runsc/test/testutil/testutil.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/runsc/test/testutil/testutil.go b/runsc/test/testutil/testutil.go
index 706db74a7..07d66e469 100644
--- a/runsc/test/testutil/testutil.go
+++ b/runsc/test/testutil/testutil.go
@@ -104,13 +104,12 @@ func FindFile(path string) (string, error) {
// TestConfig return the default configuration to use in tests.
func TestConfig() *boot.Config {
return &boot.Config{
- Debug: true,
- LogFormat: "text",
- LogPackets: true,
- Network: boot.NetworkNone,
- Strace: true,
- MultiContainer: true,
- FileAccess: boot.FileAccessExclusive,
+ Debug: true,
+ LogFormat: "text",
+ LogPackets: true,
+ Network: boot.NetworkNone,
+ Strace: true,
+ FileAccess: boot.FileAccessExclusive,
TestOnlyAllowRunAsCurrentUserWithoutChroot: true,
}
}