From d9e905bcdca020010eeea318e1ee750ed22e62a0 Mon Sep 17 00:00:00 2001
From: Sergey Dudoladov <sergey.dudoladov@zalando.de>
Date: Fri, 26 Apr 2019 10:35:29 +0200
Subject: [PATCH] minor fixes

---
 e2e/mock_e2e.sh | 7 +++++--
 e2e/tests.py    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/e2e/mock_e2e.sh b/e2e/mock_e2e.sh
index a88ab7e06..9f29a1ee6 100755
--- a/e2e/mock_e2e.sh
+++ b/e2e/mock_e2e.sh
@@ -11,8 +11,11 @@ readonly cluster_name="kind-test-postgres-operator"
 # avoid interference with previous test runs
 if [[ $(kind get clusters | grep "^${cluster_name}*") != "" ]]
 then
-  rm "$KUBECONFIG"
-  unset KUBECONFIG
+  # true if variable is set; bash >= v4.2
+  if [[ -v KUBECONFIG ]];then 
+      rm "$KUBECONFIG"
+      unset KUBECONFIG
+  fi
   kind delete cluster --name ${cluster_name}
 fi
 
diff --git a/e2e/tests.py b/e2e/tests.py
index aec41dcac..253872670 100755
--- a/e2e/tests.py
+++ b/e2e/tests.py
@@ -33,7 +33,7 @@ class SampleTestCase(unittest.TestCase):
             if v1_node_var.metadata.labels['lifecycle-status'] == 'ready':
                 labelled_nodes.add(v1_node_var.metadata.name)
 
-        assert self.nodes == labelled_nodes, "nodes incorrectly labelled"
+        self.assertEqual(self.nodes, labelled_nodes,"nodes incorrectly labelled")
 
     def tearDown(self):
         """