Merge pull request #146 from heartlock/switch-critest

Switch to critest
kubernetes-retired · May 26, 2017 · eeabc49 · eeabc49
2 parents d29e64f + e9585b3
commit eeabc49
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 1,073 deletions.
diff --git a/hack/test-e2e.sh b/hack/test-e2e.sh
@@ -39,7 +39,7 @@ function start_frakti() {
         --listen="${FRAKTI_LISTEN_ADDR}" \
         --hyper-endpoint="127.0.0.1:${HYPERD_PORT}" \
         --logtostderr \
-        --v=5 1>&2 & \
+        --v=3 1>&2 & \
     FRAKTI_PID=$!
 }
 
@@ -124,7 +124,7 @@ function test_cri() {
   go get github.com/kubernetes-incubator/cri-tools/cmd/critest
 
   # run critest
-  sudo env PATH=$PATH:$GOPATH/bin GOPATH=$GOPATH critest -r=/var/run/frakti.sock --focus="image" validation
+  sudo env PATH=$PATH:$GOPATH/bin GOPATH=$GOPATH critest -r=/var/run/frakti.sock --focus="Conformance" --skip="container port" validation
 }
 
 FRAKTI_LISTEN_ADDR=${FRAKTI_LISTEN_ADDR:-/var/run/frakti.sock}

diff --git a/test/e2e/cni.go b/test/e2e/cni.go
diff --git a/test/e2e/containers.go b/test/e2e/containers.go