rename pr tests

azure-pipelines.yml

@@ -61,7 +61,7 @@ jobs:
   - script: |
       cd test
       python3 nni_test/nnitest/run_tests.py --config config/pr_tests.yml
-    displayName: 'nnicli test'
+    displayName: 'Simple test'
   - script: |
       cd docs/en_US/
       sphinx-build -M html . _build -W
@@ -102,7 +102,7 @@ jobs:
   - script: |
       cd test
       python3 nni_test/nnitest/run_tests.py --config config/pr_tests.yml
-    displayName: 'nnicli test'
+    displayName: 'Simple test'
 
 - job: 'basic_test_pr_Windows'
   pool:
@@ -130,4 +130,4 @@ jobs:
   - script: |
       cd test
       python nni_test/nnitest/run_tests.py --config config/pr_tests.yml
-    displayName: 'nnicli test'
+    displayName: 'Simple test'

test/nni_test/nnitest/run_tests.py

@@ -13,7 +13,7 @@
 import ruamel.yaml as yaml
 
 from utils import setup_experiment, get_experiment_status, get_yml_content, dump_yml_content, get_experiment_id, \
-    parse_max_duration_time, get_trial_stats, deep_update, print_trial_job_log, get_failed_trial_jobs
+    parse_max_duration_time, get_trial_stats, deep_update, print_trial_job_log, get_failed_trial_jobs, get_experiment_dir
 from utils import GREEN, RED, CLEAR, STATUS_URL, TRIAL_JOBS_URL, EXPERIMENT_URL, REST_ENDPOINT, detect_port
 import validators
 
@@ -87,7 +87,7 @@ def invoke_validator(test_case_config, nni_source_dir):
     validator = validators.__dict__[validator_config.get('class')]()
     kwargs = validator_config.get('kwargs', {})
     print('kwargs:', kwargs)
-    validator(REST_ENDPOINT, None, nni_source_dir, **kwargs)
+    validator(REST_ENDPOINT, get_experiment_dir(EXPERIMENT_URL), nni_source_dir, **kwargs)
 
 def get_max_values(config_file):
     experiment_config = get_yml_content(config_file)

test/nni_test/nnitest/utils.py

@@ -128,23 +128,6 @@ def print_trial_job_log(training_service, trial_jobs_url):
                 print(log_file, flush=True)
                 print(log_content, flush=True)
 
-def print_failed_job_log(training_service, trial_jobs_url):
-    '''Print job log of FAILED trial jobs'''
-    trial_jobs = get_failed_trial_jobs(trial_jobs_url)
-    for trial_job in trial_jobs:
-        if training_service == 'local':
-            if sys.platform == "win32":
-                p = trial_job['stderrPath'].split(':')
-                log_filename = ':'.join([p[-2], p[-1]])
-            else:
-                log_filename = trial_job['stderrPath'].split(':')[-1]
-        else:
-            log_filename = os.path.join(get_experiment_dir(EXPERIMENT_URL), 'trials', trial_job['id'], 'stdout_log_collection.log')
-        with open(log_filename, 'r') as f:
-            log_content = f.read()
-            print(log_filename, flush=True)
-            print(log_content, flush=True)
-
 def parse_max_duration_time(max_exec_duration):
     unit = max_exec_duration[-1]
     time = max_exec_duration[:-1]