diff options
| -rw-r--r-- | runsc/boot/config.go | 8 | ||||
| -rw-r--r-- | runsc/test/testutil/testutil.go | 12 |
2 files changed, 6 insertions, 14 deletions
diff --git a/runsc/boot/config.go b/runsc/boot/config.go index d5dd400d1..c13ac150d 100644 --- a/runsc/boot/config.go +++ b/runsc/boot/config.go @@ -176,18 +176,10 @@ type Config struct { // DisableSeccomp indicates whether seccomp syscall filters should be // disabled. Pardon the double negation, but default to enabled is important. DisableSeccomp bool - - // TestModeNoFlags indicates that the ToFlags method should return - // empty. This should only be used in tests, since the test runner does - // not know about all the flags. - TestModeNoFlags bool } // ToFlags returns a slice of flags that correspond to the given Config. func (c *Config) ToFlags() []string { - if c.TestModeNoFlags { - return nil - } return []string{ "--root=" + c.RootDir, "--debug=" + strconv.FormatBool(c.Debug), diff --git a/runsc/test/testutil/testutil.go b/runsc/test/testutil/testutil.go index 1c8fd3ba2..9be4407e0 100644 --- a/runsc/test/testutil/testutil.go +++ b/runsc/test/testutil/testutil.go @@ -117,12 +117,12 @@ func SetupContainerInRoot(rootDir string, spec *specs.Spec) (bundleDir string, c } conf = &boot.Config{ - RootDir: rootDir, - Network: boot.NetworkNone, - // Don't add flags when calling subprocesses, since the test - // runner does not know about all the flags. We control the - // Config in the subprocess anyways, so it does not matter. - TestModeNoFlags: true, + Debug: true, + LogFormat: "text", + LogPackets: true, + Network: boot.NetworkNone, + RootDir: rootDir, + Strace: true, } return bundleDir, conf, nil |