Fix test bug introduced by windows port (triton-inference-server#2450)

ChrisGao001 · Jan 26, 2021 · 53a45b6 · 53a45b6
1 parent 41f5383
commit 53a45b6
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/qa/L0_batcher/batcher_test.py b/qa/L0_batcher/batcher_test.py
@@ -48,8 +48,12 @@
 if TEST_CUDA_SHARED_MEMORY:
     import tritonclient.utils.cuda_shared_memory as cudashm
 
+# Test with either GRPC of HTTP, but not both since when we check
+# results we expect only one to run
 USE_GRPC = (os.environ.get('USE_GRPC', 1) != "0")
 USE_HTTP = (os.environ.get('USE_HTTP', 1) != "0")
+if USE_GRPC and USE_HTTP:
+    USE_GRPC = False
 assert USE_GRPC or USE_HTTP, "USE_GRPC or USE_HTTP must be non-zero"
 
 BACKENDS = os.environ.get('BACKENDS',
@@ -341,6 +345,8 @@ def test_multi_batch_different_shape_allow_ragged(self):
                                      args=(self, trial, 1, dtype, ([1, 16],),
                                            ([1, 16],)),
                                      kwargs={
+                                         'use_grpc': USE_GRPC,
+                                         'use_http': USE_HTTP,
                                          'use_http_json_tensors': False,
                                          'use_streaming': False
                                      }))
@@ -349,6 +355,8 @@ def test_multi_batch_different_shape_allow_ragged(self):
                                      args=(self, trial, 1, dtype, ([1, 8],),
                                            ([1, 8],)),
                                      kwargs={
+                                         'use_grpc': USE_GRPC,
+                                         'use_http': USE_HTTP,
                                          'use_http_json_tensors': False,
                                          'use_streaming': False
                                      }))
@@ -1299,6 +1307,8 @@ def test_multi_batch_preserve_ordering(self):
                                      args=(self, model_base, 1, dtype, shapes,
                                            shapes),
                                      kwargs={
+                                         'use_grpc': USE_GRPC,
+                                         'use_http': USE_HTTP,
                                          'use_http_json_tensors':
                                              False,
                                          'use_streaming':