Merge pull request #391 from forsyth2/complete-run-workflow

Improve complete_run workflow
E3SM-Project · Feb 25, 2021 · aa581a3 · aa581a3
2 parents 27ee630 + 83f8a4f
commit aa581a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,12 +48,14 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+image_check_failures
 tests/unit_test_data
 tests/unit_test_images
 tests/image_check_failures/
 tests/system/all_sets_results_test/
 tests/system/image_check_failures/
 tests/v2_3_0_all_sets/
+v2_3_0_all_sets/
 
 # Translations
 *.mo

diff --git a/tests/complete_run_v2_3_0.py → tests/complete_run.py b/tests/complete_run_v2_3_0.py → tests/complete_run.py
@@ -1,6 +1,7 @@
 import os
 import unittest
 
+# This test should be run with the latest E3SM Diags tutorial code.
 from examples.tutorials.tutorial_v2_3_0_all_sets_E3SM_machines import run_lcrc
 from tests.system.test_diags import compare_images
 
@@ -13,8 +14,8 @@ def test_complete_run(self):
         actual_images_dir = run_lcrc(".")
 
         # The expected_images_file lists all images we expect to compare.
-        expected_images_file = "/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/expected_images_v2_3_0_all_sets_2021_02_22.txt"
-        expected_images_dir = "/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/v2_3_0_all_sets_2021_02_22"
+        expected_images_file = "/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/expected/image_list_all_sets.txt"
+        expected_images_dir = "/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/expected/all_sets"
 
         mismatched_images = []  # type:ignore