Disable tf.where python tests (#764)

* Fix errors in pytests scripts that prevented "Where" unit tests from running
* Skip tf.where tests

test/python/common.py

@@ -105,13 +105,14 @@ def is_env_variable_set(self, env_var):
 
     # sets the env variable
     def set_env_variable(self, env_var, env_var_val):
-        os.putenv(env_var, env_var_val)
+        os.environ[env_var] = env_var_val
         print("Setting env variable ", env_var, " to ", env_var_val)
 
     # unset the env variable
     def unset_env_variable(self, env_var):
-        os.unsetenv(env_var)
-        print("Unset env variable ", env_var)
+        if self.is_env_variable_set(env_var):
+            os.environ.pop(env_var)
+            print("Unset env variable ", env_var)
 
     # get the env variable
     def get_env_variable(self, env_var):

test/python/conftest.py

@@ -44,7 +44,10 @@ def pattern_to_regex(pattern):
     pattern = re.sub(r'\*', '.*', pattern)
     # special case for M.C.F when it possibly matches with parameterized tests
     if pattern_noparam.count('.') == 2 and no_param:
-        pattern = '^' + pattern + r'\[.*'
+        if no_param:
+            pattern = '^' + pattern + '$'
+        else:
+            pattern = '^' + pattern + r'\[.*'
     if pattern_noparam.count('.') == 0:
         pattern = '^' + pattern + r'\..*\..*' + '$'
     if pattern_noparam.count('.') == 1:

test/python/test_api.py

@@ -45,8 +45,8 @@ def test_set_backend_invalid(self):
         except:
             error_thrown = True
         ngraph_bridge.set_backend(current_backend)
-        assert error_thrown
         self.restore_env_variables(env_var_map)
+        assert error_thrown
 
     def test_list_backends(self):
         assert len(ngraph_bridge.list_backends())

test/python/test_select.py

@@ -109,12 +109,12 @@ def run_test(sess):
 class TestWhere(NgraphTest):
     env_map = None
 
-    def __init__(self):
-        env_map = self.store_env_variables(['NGRAPH_TF_CONSTANT_FOLDING'])
+    def setup_method(self):
+        self.env_map = self.store_env_variables(['NGRAPH_TF_CONSTANT_FOLDING'])
         self.set_env_variable('NGRAPH_TF_CONSTANT_FOLDING', '1')
 
-    def __del__(self):
-        self.restore_env_variables(env_map)
+    def teardown_method(self):
+        self.restore_env_variables(self.env_map)
 
     def test_where(self):
         a = np.array([1.1, 3.0], [2.2, 4.4]).astype(np.float32)

test/python/tests_common.txt

@@ -32,3 +32,6 @@
 
 test_bfloat16.TestBfloat16.test_matmul_bfloat16 # most backends do not support dtype bf16 for MatMul/Dot Op
 test_conv2dbackpropinput.TestConv2DBackpropInput.test_nhwc # parameterized; Fails, needs debugging
+
+test_select.TestWhere.* # Where op translation not working yet
+