From a017fa6afc9a907b62c6ba1967020d4954f39a75 Mon Sep 17 00:00:00 2001
From: Sandeep Datta <sandeepd@nvidia.com>
Date: Thu, 15 Aug 2024 13:21:14 -0700
Subject: [PATCH] Install pytest and activate conda environment from within the
 test script.

---
 .github/actions/test/action.yml               | 2 --
 continuous_integration/scripts/make-conda-env | 2 ++
 continuous_integration/scripts/test           | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
index 03c5134..b423153 100644
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@@ -39,6 +39,4 @@ runs:
     - name: Run test / analysis
       shell: bash --noprofile --norc -xeuo pipefail {0}
       run: |
-        . "${{ env.REPO_DIR }}/continuous_integration/scripts/conda-utils"
-        activate_conda_env
         "${{ env.REPO_DIR }}/continuous_integration/scripts/entrypoint" "${{ env.REPO_DIR }}/continuous_integration/scripts/test" ${{ inputs.test-options }}
diff --git a/continuous_integration/scripts/make-conda-env b/continuous_integration/scripts/make-conda-env
index 8975d7d..8361ceb 100755
--- a/continuous_integration/scripts/make-conda-env
+++ b/continuous_integration/scripts/make-conda-env
@@ -13,6 +13,8 @@ make_test_env() {
 
     activate_conda_env
 
+    conda install pytest
+
     pip install "${ARTIFACTS_DIR}"/*.whl
 
 }
diff --git a/continuous_integration/scripts/test b/continuous_integration/scripts/test
index ad0f67c..4aa3050 100755
--- a/continuous_integration/scripts/test
+++ b/continuous_integration/scripts/test
@@ -5,6 +5,8 @@ run_test_or_analysis() {
 
     . conda-utils;
 
+    activate_conda_env;
+
     conda_info;
 
     set -xeuo pipefail