Merge pull request #165 from lsst/tickets/DM-35544

DM-35544: Fix test for existing environment.

scripts/lsstinstall

@@ -274,14 +274,7 @@ fi
 rubinenv_name=${rubinenv_name:-lsst-scipipe-$rubinenv_version}
 [ "$exact" = true ] && [ -z "$env_hash" ] && rubinenv_name="${rubinenv_name}-exact"
 
-use_existing=false
-if [ -z "$dryrun" ] && conda info --envs --json | grep "\"$rubinenv_name\"" > /dev/null 2>&1; then
-    use_existing=true
-fi
-if [ -n "$dryrun" ] && [ -d "$conda_path/envs/$rubinenv_name" ]; then
-    use_existing=true
-fi
-if [ "$use_existing" = true ]; then
+if [ -d "$conda_path/envs/$rubinenv_name" ]; then
     echo "Using existing environment $rubinenv_name"
     if [ "$update" = true ] && [ "$exact" != true ] && [ -z "$env_hash" ]; then
         echo "Updating rubin-env=$rubinenv_version"

test-lsstinstall.bash

@@ -77,6 +77,8 @@ testdir=./testconda$$
     ./scripts/lsstinstall -n | grepf '\$ mamba create '
 
     mkdir -p "$testdir"/envs/foo-lsst
+    ./scripts/lsstinstall -n -e foo-lsst | grepf 'Using existing environment foo-lsst'
+    ./scripts/lsstinstall -n -e foo-lsst | xfail grep 'Updating rubin-env=' 
     ./scripts/lsstinstall -n -u -e foo-lsst | grepf 'Updating rubin-env='
 
     rm -rf "$testdir"