added code for bash in config

TerrenceMcGuinness-NOAA · May 31, 2024 · e1b4907 · e1b4907
1 parent b457a9f
commit e1b4907
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/ci-unit_tests.yaml b/.github/workflows/ci-unit_tests.yaml
@@ -49,16 +49,17 @@ jobs:
           sudo mkdir -p /work/noaa
           cd $GITHUB_WORKSPACE/sorc/wxflow
           git submodule update --init
+          git checkout config_env_xor
           cd $GITHUB_WORKSPACE/sorc/gsi_utils.fd
           git submodule update --init
           cd $GITHUB_WORKSPACE/sorc
           ./link_workflow.sh
           cd $GITHUB_WORKSPACE/ci/scripts/tests
           ln -s $GITHUB_WORKSPACE/sorc/wxflow/src/wxflow .
-          pytest -v test_setup.py --junitxml $GITHUB_WORKSPACE/ci/scripts/tests/test-results.xml
-          ls $GITHUB_WORKSPACE/ci/scripts/tests/testdata/RUNDIR/EXPDIR/C48_ATM/config.base
-          grep EXPDIR $GITHUB_WORKSPACE/ci/scripts/tests/testdata/RUNDIR/EXPDIR/C48_ATM/config.base
-          python3 ${GITHUB_WORKSPACE}/workflow/setup_xml.py $GITHUB_WORKSPACE/ci/scripts/tests/testdata/RUNDIR/EXPDIR/C48_ATM
+          pytest -v --junitxml $GITHUB_WORKSPACE/ci/scripts/tests/test-results.xml
+          #ls $GITHUB_WORKSPACE/ci/scripts/tests/testdata/RUNDIR/EXPDIR/C48_ATM/config.base
+          #grep EXPDIR $GITHUB_WORKSPACE/ci/scripts/tests/testdata/RUNDIR/EXPDIR/C48_ATM/config.base
+          # ${GITHUB_WORKSPACE}/workflow/setup_xml.py $GITHUB_WORKSPACE/ci/scripts/tests/testdata/RUNDIR/EXPDIR/C48_ATM
 
       - name: Publish Test Results
         if: always()

diff --git a/ci/scripts/tests/test_setup.py b/ci/scripts/tests/test_setup.py
@@ -31,13 +31,11 @@ def test_setup_xml():
         f"{RUNDIR}/EXPDIR/C48_ATM",
     ]
 
-    #env = os.environ.copy()
-    #env['ACCOUNT'] = "foo"
+    env = os.environ.copy()
+    env['ACCOUNT'] = "foo"
 
     setup_xml_script = Executable(setup_xml_py)
     setup_xml_script.add_default_arg(arguments)
-    #setup_xml_script()
-    #assert (setup_xml_script.returncode == 0)
-    assert ( True )
-
-#    rmtree(testdata)
+    setup_xml_script(env=env)
+    assert (setup_xml_script.returncode == 0)
+    rmtree(RUNDIR)