Update test_command.py

check with original test
nv-legate · Nov 16, 2023 · c55182f · c55182f
1 parent 1d42ffc
commit c55182f
Showing 1 changed file with 12 additions and 29 deletions.
diff --git a/tests/unit/legate/driver/test_command.py b/tests/unit/legate/driver/test_command.py
@@ -1106,10 +1106,7 @@ def test_default_multi_rank_no_ucx(
         result = m.cmd_bgwork(config, system, launcher)
         install_info.networks[:] = networks_orig[:]
 
-        if "ucx" in install_info.networks:
-            assert result == ("-ll:bgwork", "2", "-ll:bgworkpin", "1")
-        else:
-            assert result == ("-ll:bgwork", "2")
+        assert result == ("-ll:bgwork", "2")
 
     @pytest.mark.parametrize("rank_var", RANK_ENV_VARS)
     @pytest.mark.parametrize("rank", ("0", "1", "2"))
@@ -1124,10 +1121,8 @@ def test_default_multi_rank_and_ucx(
         install_info.networks.append("ucx")
         result = m.cmd_bgwork(config, system, launcher)
         install_info.networks[:] = networks_orig[:]
-        if "ucx" in install_info.networks:
-            assert result == ("-ll:bgwork", value, "-ll:bgworkpin", "1")
-        else:
-            assert result == ("-ll:bgwork", value)
+
+        assert result == ("-ll:bgwork", "2", "-ll:bgworkpin", "1")
 
     @pytest.mark.parametrize("rank_var", RANK_ENV_VARS)
     @pytest.mark.parametrize("rank", ("0", "1", "2"))
@@ -1143,10 +1138,7 @@ def test_utility_1_multi_rank_no_launcher_no_ucx(
         result = m.cmd_bgwork(config, system, launcher)
         install_info.networks[:] = networks_orig[:]
 
-        if "ucx" in install_info.networks:
-            assert result == ("-ll:bgwork", "2", "-ll:bgworkpin", "1")
-        else:
-            assert result == ("-ll:bgwork", "2")
+        assert result == ("-ll:bgwork", "2")
 
     @pytest.mark.parametrize("rank_var", RANK_ENV_VARS)
     @pytest.mark.parametrize("rank", ("0", "1", "2"))
@@ -1161,10 +1153,8 @@ def test_utility_1_multi_rank_no_launcher_and_ucx(
         install_info.networks.append("ucx")
         result = m.cmd_bgwork(config, system, launcher)
         install_info.networks[:] = networks_orig[:]
-        if "ucx" in install_info.networks:
-            assert result == ("-ll:bgwork", "2", "-ll:bgworkpin", "1")
-        else:
-            assert result == ("-ll:bgwork", "2")
+
+        assert result == ("-ll:bgwork", "2", "-ll:bgworkpin", "1")
 
     @pytest.mark.parametrize("launch", ("mpirun", "jsrun", "srun"))
     def test_utility_1_multi_rank_with_launcher_no_ucx(
@@ -1179,10 +1169,7 @@ def test_utility_1_multi_rank_with_launcher_no_ucx(
         result = m.cmd_bgwork(config, system, launcher)
         install_info.networks[:] = networks_orig[:]
 
-        if "ucx" in install_info.networks:
-            assert result == ("-ll:bgwork", "2", "-ll:bgworkpin", "1")
-        else:
-            assert result == ("-ll:bgwork", "2")
+        assert result == ("-ll:bgwork", "2")
 
     @pytest.mark.parametrize("launch", ("mpirun", "jsrun", "srun"))
     def test_utility_1_multi_rank_with_launcher_and_ucx(
@@ -1213,10 +1200,8 @@ def test_utility_n_multi_rank_no_launcher_no_ucx(
         install_info.networks = [x for x in networks_orig if x != "ucx"]
         result = m.cmd_bgwork(config, system, launcher)
         install_info.networks[:] = networks_orig[:]
-        if "ucx" in install_info.networks:
-            assert result == ("-ll:bgwork", value, "-ll:bgworkpin", "1")
-        else:
-            assert result == ("-ll:bgwork", value)
+
+        assert result == ("-ll:bgwork", value)
 
     @pytest.mark.parametrize("rank_var", RANK_ENV_VARS)
     @pytest.mark.parametrize("rank", ("0", "1", "2"))
@@ -1248,10 +1233,8 @@ def test_utility_n_multi_rank_with_launcher_no_ucx(
         install_info.networks = [x for x in networks_orig if x != "ucx"]
         result = m.cmd_bgwork(config, system, launcher)
         install_info.networks[:] = networks_orig[:]
-        if "ucx" in install_info.networks:
-            assert result == ("-ll:bgwork", value, "-ll:bgworkpin", "1")
-        else:
-            assert result == ("-ll:bgwork", value)
+
+        assert result == ("-ll:bgwork", value)
 
     @pytest.mark.parametrize("launch", ("mpirun", "jsrun", "srun"))
     @pytest.mark.parametrize("value", ("2", "3", "10"))
@@ -1630,4 +1613,4 @@ def test_with_legate_opts(self, genobjs: GenObjs, opts: list[str]) -> None:
 
 
 if __name__ == "__main__":
-    sys.exit(pytest.main(sys.argv))
+    sys.exit(pytest.main(sys.argv))