diff options
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/cmd/exec.go | 3 | ||||
| -rw-r--r-- | runsc/sandbox/sandbox_test.go | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/runsc/cmd/exec.go b/runsc/cmd/exec.go index 8379f552d..576031b5b 100644 --- a/runsc/cmd/exec.go +++ b/runsc/cmd/exec.go @@ -99,7 +99,6 @@ func (ex *Exec) Execute(_ context.Context, f *flag.FlagSet, args ...interface{}) if err != nil { Fatalf("error parsing process spec: %v", err) } - e.Detach = ex.detach conf := args[0].(*boot.Config) waitStatus := args[1].(*syscall.WaitStatus) @@ -123,7 +122,7 @@ func (ex *Exec) Execute(_ context.Context, f *flag.FlagSet, args ...interface{}) // executed. If detach was specified, starts a child in non-detach mode, // write the child's PID to the pid file. So when the container returns, the // child process will also return and signal containerd. - if e.Detach { + if ex.detach { binPath, err := specutils.BinPath() if err != nil { Fatalf("error getting bin path: %v", err) diff --git a/runsc/sandbox/sandbox_test.go b/runsc/sandbox/sandbox_test.go index 6c71cac30..6e3125b7b 100644 --- a/runsc/sandbox/sandbox_test.go +++ b/runsc/sandbox/sandbox_test.go @@ -365,7 +365,6 @@ func TestExec(t *testing.T) { Envv: []string{"PATH=" + os.Getenv("PATH")}, WorkingDirectory: "/", KUID: uid, - Detach: false, } // Verify that "sleep 100" and "sleep 5" are running after exec. @@ -472,7 +471,6 @@ func TestCapabilities(t *testing.T) { KUID: uid, KGID: gid, Capabilities: &auth.TaskCapabilities{}, - Detach: true, } // "exe" should fail because we don't have the necessary permissions. @@ -484,14 +482,10 @@ func TestCapabilities(t *testing.T) { execArgs.Capabilities = &auth.TaskCapabilities{ EffectiveCaps: auth.CapabilitySetOf(linux.CAP_DAC_OVERRIDE), } - // First, start running exec. + // "exe" should not fail this time. if _, err := s.Execute(&execArgs); err != nil { t.Fatalf("sandbox failed to exec %v: %v", execArgs, err) } - - if err := waitForProcessList(s, expectedPL); err != nil { - t.Error(err) - } } // Test that an tty FD is sent over the console socket if one is provided. |