modified existing tests

yash-ni · Aug 30, 2023 · df92ba0 · df92ba0
1 parent 1b4c73d
commit df92ba0
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 10 deletions.
diff --git a/...types-oneof/all-datatypes-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py b/...types-oneof/all-datatypes-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py
@@ -88,7 +88,7 @@ def read_json(filepath):
         test_data = json.load(file)
     return test_data
 
-GetFeature_json_file_path = f'{os.path.dirname(os.path.abspath(__file__))}/testcases/GetFeature.json'
+GetFeature_json_file_path = f'{os.path.dirname(os.path.dirname(os.path.abspath(__file__)))}/testcases/GetFeature.json'
 
 @pytest.mark.parametrize('testcase', read_json(GetFeature_json_file_path))
 def test_SayHello(testcase):

diff --git a/...ATS/Tests/enum-oneof/enum-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py b/...ATS/Tests/enum-oneof/enum-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py
@@ -26,7 +26,7 @@ def read_json(filepath):
         test_data = json.load(file)
     return test_data
 
-GetFeature_json_file_path = f'{os.path.dirname(os.path.abspath(__file__))}/testcases/GetFeature.json'
+GetFeature_json_file_path = f'{os.path.dirname(os.path.dirname(os.path.abspath(__file__)))}/testcases/GetFeature.json'
 
 @pytest.mark.parametrize('testcase', read_json(GetFeature_json_file_path))
 def test_SayHello(testcase):

diff --git a/...ATS/Tests/helloworld/helloworld_client.py → ...lloworld/Python_client/SayHello_client.py b/...ATS/Tests/helloworld/helloworld_client.py → ...lloworld/Python_client/SayHello_client.py
@@ -10,7 +10,7 @@ def read_json(filepath):
         test_data = json.load(file)
     return test_data
 
-SayHello_json_file_path = f'{os.path.dirname(os.path.abspath(__file__))}/testcases/SayHello.json'
+SayHello_json_file_path = f'{os.path.dirname(os.path.dirname(os.path.abspath(__file__)))}/testcases/SayHello.json'
 
 def get_SayHello_output(test_input):
     name = test_input['name']

diff --git a/...sts/message-oneof/message-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py b/...sts/message-oneof/message-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py
@@ -31,7 +31,7 @@ def read_json(filepath):
         test_data = json.load(file)
     return test_data
 
-GetFeature_json_file_path = f'{os.path.dirname(os.path.abspath(__file__))}/testcases/GetFeature.json'
+GetFeature_json_file_path = f'{os.path.dirname(os.path.dirname(os.path.abspath(__file__)))}/testcases/GetFeature.json'
 
 @pytest.mark.parametrize('testcase', read_json(GetFeature_json_file_path))
 def test_SayHello(testcase):

diff --git a/...ield-oneof/multiple-field-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py b/...ield-oneof/multiple-field-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py
@@ -34,7 +34,7 @@ def read_json(filepath):
         test_data = json.load(file)
     return test_data
 
-GetFeature_json_file_path = f'{os.path.dirname(os.path.abspath(__file__))}/testcases/GetFeature.json'
+GetFeature_json_file_path = f'{os.path.dirname(os.path.dirname(os.path.abspath(__file__)))}/testcases/GetFeature.json'
 
 @pytest.mark.parametrize('testcase', read_json(GetFeature_json_file_path))
 def test_SayHello(testcase):

diff --git a/...Tests/nested-oneof/nested-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py b/...Tests/nested-oneof/nested-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py
@@ -50,7 +50,7 @@ def read_json(filepath):
         test_data = json.load(file)
     return test_data
 
-GetFeature_json_file_path = f'{os.path.dirname(os.path.abspath(__file__))}/testcases/GetFeature.json'
+GetFeature_json_file_path = f'{os.path.dirname(os.path.dirname(os.path.abspath(__file__)))}/testcases/GetFeature.json'
 
 @pytest.mark.parametrize('testcase', read_json(GetFeature_json_file_path))
 def test_SayHello(testcase):

diff --git a/...sts/sibling-oneof/sibling-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py b/...sts/sibling-oneof/sibling-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py
@@ -35,7 +35,7 @@ def read_json(filepath):
         test_data = json.load(file)
     return test_data
 
-GetFeature_json_file_path = f'{os.path.dirname(os.path.abspath(__file__))}/testcases/GetFeature.json'
+GetFeature_json_file_path = f'{os.path.dirname(os.path.dirname(os.path.abspath(__file__)))}/testcases/GetFeature.json'
 
 @pytest.mark.parametrize('testcase', read_json(GetFeature_json_file_path))
 def test_GetFeature(testcase):

diff --git a/...Tests/simple-oneof/simple-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py b/...Tests/simple-oneof/simple-oneof_client.py → ...-oneof/Python_client/GetFeature_client.py
@@ -27,7 +27,7 @@ def read_json(filepath):
         test_data = json.load(file)
     return test_data
 
-GetFeature_json_file_path = f'{os.path.dirname(os.path.abspath(__file__))}/testcases/GetFeature.json'
+GetFeature_json_file_path = f'{os.path.dirname(os.path.dirname(os.path.abspath(__file__)))}/testcases/GetFeature.json'
 
 @pytest.mark.parametrize('testcase', read_json(GetFeature_json_file_path))
 def test_SayHello(testcase):

diff --git a/tests/New_ATS/pylib/run_tests.py b/tests/New_ATS/pylib/run_tests.py
@@ -20,7 +20,8 @@ def count_failed_testcases(test_summary):
 def run_command(command):
     output = subprocess.run(command, capture_output=True, text=True)
     if output.stderr:
-        raise Exception(output.stderr)
+        # raise Exception(output.stderr)
+        print(output.stderr)
     return output.stdout
 
 
@@ -131,6 +132,7 @@ def run_test(test_config):
                 rpc_name
             ])
             print (f"Running python client for {rpc_name}")
+            print(run_client_command)
             output = run_command(run_client_command)
             print(output+'\n')
             FAILED += count_failed_testcases(output)

diff --git a/tests/New_ATS/pylib/testlist.json b/tests/New_ATS/pylib/testlist.json
@@ -1,6 +1,15 @@
 [
   {
-    "name": ["routeguide"],
+    "name": [
+      "helloworld",
+      "routeguide",
+      "enum-oneof",
+      "message-oneof",
+      "multiple-field-oneof",
+      "nested-oneof",
+      "sibling-oneof",
+      "simple-oneof"
+    ],
     "gen_type": "0",
     "labview_version": "2019",
     "labview_bitness": "32"