Update e2e tests

testing/scripts/conftest.py

@@ -6,26 +6,40 @@
 
 @pytest.fixture(scope="module")
 def clusterwide_seldon_helm(request):
-    version = get_seldon_version()
-    create_seldon_clusterwide_helm(request,version)
-    port_forward(request)
+    do_clusterwide_seldon_helm(request)
 
 @pytest.fixture(scope="module")
-def setup_python_s2i(request):
-    build_python_s2i_images()
+def setup_python_s2i():
+    do_setup_python_s2i()
 
 @pytest.fixture(scope="module")
 def s2i_python_version():
-    return get_s2i_python_version()
+    return do_s2i_python_version()
 
 @pytest.fixture(scope="session")
 def seldon_images(request):
+    do_seldon_images()
+
+@pytest.fixture(scope="session")
+def seldon_version():
+    return get_seldon_version()
+
+#### Implementatiosn below
+
+def do_s2i_python_version():
+    return get_s2i_python_version()
+
+def do_clusterwide_seldon_helm(request=None):
+    version = get_seldon_version()
+    create_seldon_clusterwide_helm(request,version)
+    port_forward(request)
+
+def do_seldon_images(request=None):
     create_docker_repo(request)
     port_forward_docker_repo(request)
     build_java_images()
     version = get_seldon_version()
     build_go_images(version)
 
-@pytest.fixture(scope="session")
-def seldon_version():
-    return get_seldon_version()
+def do_setup_python_s2i():
+    build_python_s2i_images()

testing/scripts/go_utils.py

@@ -9,3 +9,4 @@
 def build_go_images(version):
     run("rm -rf ${PWD}/go && export GOPATH=${PWD}/go && mkdir -p $GOPATH/src/github.com/seldonio/ && cd ./go/src/github.com/seldonio && git clone https://github.com/SeldonIO/seldon-operator.git && cd seldon-operator && make docker-build docker-push-local-private VERSION="+version, shell=True, check=True)
 
+

testing/scripts/k8s_utils.py

@@ -44,7 +44,8 @@ def fin():
         run("kubectl delete namespace seldon", shell=True)
         run("kubectl delete namespace test1", shell=True)
 
-    request.addfinalizer(fin)
+    if not request is None:
+        request.addfinalizer(fin)
 
 
 def get_seldon_version():
@@ -76,7 +77,8 @@ def create_seldon_clusterwide_helm(request, version):
     run('kubectl rollout status statefulset.apps/seldon-operator-controller-manager -n seldon-system', shell=True)
     create_ambassador()
     create_seldon_gateway(version)
-    setup_finalizer_helm(request)
+    if not request is None:
+        setup_finalizer_helm(request)
 
 
 @retry(wait_exponential_multiplier=1000, wait_exponential_max=10000, stop_max_attempt_number=5)
@@ -95,7 +97,8 @@ def fin():
         os.killpg(os.getpgid(p2.pid), signal.SIGTERM)
         os.killpg(os.getpgid(p3.pid), signal.SIGTERM)
 
-    request.addfinalizer(fin)
+    if not request is None:
+        request.addfinalizer(fin)
 
 
 def create_docker_repo(request):
@@ -110,7 +113,8 @@ def fin():
         run('kubectl delete -f ../resources/docker-private-registry-proxy.json --ignore-not-found=true -n default',
             shell=True)
 
-    request.addfinalizer(fin)
+    if not request is None:
+        request.addfinalizer(fin)
 
 
 @retry(wait_exponential_multiplier=1000, wait_exponential_max=10000, stop_max_attempt_number=5)
@@ -124,4 +128,5 @@ def fin():
         print("teardown port-foward docker")
         os.killpg(os.getpgid(p1.pid), signal.SIGTERM)
 
-    request.addfinalizer(fin)
+    if not request is None:
+        request.addfinalizer(fin)

testing/scripts/seldon_utils.py

@@ -126,15 +126,15 @@ def grpc_request_ambassador(deploymentName,namespace,endpoint="localhost:8004",d
 
 def grpc_request_ambassador2(deploymentName,namespace,endpoint="localhost:8004",data_size=5,rows=1,data=None):
     try:
-        grpc_request_ambassador(deploymentName,namespace,endpoint=endpoint,data_size=data_size,rows=rows,data=data)
+        return grpc_request_ambassador(deploymentName,namespace,endpoint=endpoint,data_size=data_size,rows=rows,data=data)
     except:
         print("Warning - caught exception")
-        grpc_request_ambassador(deploymentName,namespace,endpoint=endpoint,data_size=data_size,rows=rows,data=data)
+        return grpc_request_ambassador(deploymentName,namespace,endpoint=endpoint,data_size=data_size,rows=rows,data=data)
 
 def grpc_request_api_gateway2(oauth_key,oauth_secret,namespace,rest_endpoint="localhost:8002",grpc_endpoint="localhost:8003",data_size=5,rows=1,data=None):
     try:
-        grpc_request_api_gateway(oauth_key,oauth_secret,namespace,rest_endpoint=rest_endpoint,grpc_endpoint=grpc_endpoint,data_size=data_size,rows=rows,data=data)
+        return  grpc_request_api_gateway(oauth_key,oauth_secret,namespace,rest_endpoint=rest_endpoint,grpc_endpoint=grpc_endpoint,data_size=data_size,rows=rows,data=data)
     except:
-        print("Warning - caught exception")        
-        grpc_request_api_gateway(oauth_key,oauth_secret,namespace,rest_endpoint=rest_endpoint,grpc_endpoint=grpc_endpoint,data_size=data_size,rows=rows,data=data)        
-    
+        print("Warning - caught exception")
+        return grpc_request_api_gateway(oauth_key,oauth_secret,namespace,rest_endpoint=rest_endpoint,grpc_endpoint=grpc_endpoint,data_size=data_size,rows=rows,data=data)
+