summaryrefslogtreecommitdiffhomepage
path: root/runsc/sandbox
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2018-05-02 17:39:12 -0700
committerShentubot <shentubot@google.com>2018-05-02 17:40:01 -0700
commita61def1b368a9042e346787008e12770e4e67b35 (patch)
tree471e9c844c6dc5d6cd8e6949a47d78c52132d3b0 /runsc/sandbox
parent6c061ad913fce6fbfe9a98c0fc1f5b67fad1b9b0 (diff)
Remove detach for exec options
Detachable exec commands are handled in the client entirely and the detach option is not used anymore. PiperOrigin-RevId: 195181272 Change-Id: I6e82a2876d2c173709c099be59670f71702e5bf0
Diffstat (limited to 'runsc/sandbox')
-rw-r--r--runsc/sandbox/sandbox_test.go8
1 files changed, 1 insertions, 7 deletions
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.