summaryrefslogtreecommitdiffhomepage
path: root/runsc/test
diff options
context:
space:
mode:
authorNicolas Lacasse <nlacasse@google.com>2018-10-24 23:06:51 -0700
committerShentubot <shentubot@google.com>2018-10-24 23:07:35 -0700
commita5fe397cf806cbc488757dbd73a3d83eb5da11cd (patch)
tree595a1670feede8a064ba3824facb32fe5e9c37de /runsc/test
parente7191f058f550cc3a203a854a1d81f7746c96e53 (diff)
Re-enable TestPythonHello now that ptrace seccomp issue is resolved.
PiperOrigin-RevId: 218636184 Change-Id: I44deac3f32276d06955c5fb1e28c5970bb08f5fd
Diffstat (limited to 'runsc/test')
-rw-r--r--runsc/test/image/image_test.go6
-rw-r--r--runsc/test/testutil/docker.go9
2 files changed, 0 insertions, 15 deletions
diff --git a/runsc/test/image/image_test.go b/runsc/test/image/image_test.go
index 763152b47..f7e750d71 100644
--- a/runsc/test/image/image_test.go
+++ b/runsc/test/image/image_test.go
@@ -192,12 +192,6 @@ func TestMysql(t *testing.T) {
}
func TestPythonHello(t *testing.T) {
- // TODO: This test occasionally hangs on the ptrace
- // platform. Re-enable it once we have this issue fixed.
- if testutil.IsPtracePlatform() {
- t.Skipf("Skipping PythonHello test on ptrace platform")
- }
-
if err := testutil.Pull("google/python-hello"); err != nil {
t.Fatalf("docker pull failed: %v", err)
}
diff --git a/runsc/test/testutil/docker.go b/runsc/test/testutil/docker.go
index 3f74e0770..9a76397be 100644
--- a/runsc/test/testutil/docker.go
+++ b/runsc/test/testutil/docker.go
@@ -49,15 +49,6 @@ func IsPauseResumeSupported() bool {
return !strings.Contains(getRuntime(), "hostnet")
}
-// IsPtracePlatform returns true if the runtime is using ptrace platform.
-//
-// TODO: Tests should not depend on the platform, but
-// TestPythonHello sometimes hangs on ptrace. Once that is debugged, this
-// method should go away.
-func IsPtracePlatform() bool {
- return !strings.Contains(getRuntime(), "kvm")
-}
-
// EnsureSupportedDockerVersion checks if correct docker is installed.
func EnsureSupportedDockerVersion() {
cmd := exec.Command("docker", "version")