From 0675bd5c885be2b653797b327e5cdb7070cbbd84 Mon Sep 17 00:00:00 2001
From: "mulin.lyh" <mulin.lyh@taobao.com>
Date: Tue, 3 Jan 2023 16:26:59 +0800
Subject: [PATCH] [to #47031187]fix: hub test suites can not parallel        
 Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/11276872

    * [to #47031187]fix: hub test suites can not parallel
---
 tests/run.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/run.py b/tests/run.py
index 1b252756..6daba6dc 100644
--- a/tests/run.py
+++ b/tests/run.py
@@ -355,10 +355,34 @@ def run_case_in_env(env_name, env, test_suite_env_map, isolated_cases,
     run_command_with_popen(cmd)
 
 
+def run_non_parallelizable_test_suites(suites, result_dir):
+    cmd = ['python', 'tests/run.py', '--result_dir', result_dir, '--suites']
+    for suite in suites:
+        cmd.append(suite)
+    run_command_with_popen(cmd)
+
+
 def run_in_subprocess(args):
     # only case args.isolated_cases run in subporcess, all other run in a subprocess
     test_suite_files = gather_test_suites_files(
         os.path.abspath(args.test_dir), args.pattern)
+
+    non_parallelizable_suites = [
+        'test_download_dataset.py',
+        'test_hub_examples.py',
+        'test_hub_operation.py',
+        'test_hub_private_files.py',
+        'test_hub_private_repository.py',
+        'test_hub_repository.py',
+        'test_hub_retry.py',
+        'test_hub_revision.py',
+        'test_hub_revision_release_mode.py',
+        'test_hub_upload.py',
+    ]
+    test_suite_files = [
+        x for x in test_suite_files if x not in non_parallelizable_suites
+    ]
+
     run_config = None
     isolated_cases = []
     test_suite_env_map = {}
@@ -383,6 +407,11 @@ def run_in_subprocess(args):
         isolated_cases = test_suite_files
 
     with tempfile.TemporaryDirectory() as temp_result_dir:
+        # first run cases that nonparallelizable
+        run_non_parallelizable_test_suites(non_parallelizable_suites,
+                                           temp_result_dir)
+
+        # run case parallel in envs
         for env in set(test_suite_env_map.values()):
             parallel_run_case_in_env(env, run_config['envs'][env],
                                      test_suite_env_map, isolated_cases,