Merge pull request #1091 from jlarkin09/AIPCC-14568-e2e-trap-fix

fix(e2e): chain on_exit in constraint test EXIT traps

Author: mergify[bot]

e2e/test_bootstrap_conflicting_requirements.sh

@@ -12,7 +12,7 @@ source "$SCRIPTDIR/common.sh"
 
 # expected pbr version
 constraints_file=$(mktemp)
-trap "rm -f $constraints_file" EXIT
+trap 'rm -f "$constraints_file"; on_exit' EXIT
 echo "pbr==7.0.3" > "$constraints_file"
 
 # passing settings to bootstrap but should have 0 effect on it

e2e/test_bootstrap_constraints.sh

@@ -11,7 +11,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "$SCRIPTDIR/common.sh"
 
 constraints_file=$(mktemp)
-trap "rm -f $constraints_file" EXIT
+trap 'rm -f "$constraints_file"; on_exit' EXIT
 echo "stevedore==4.0.0" > "$constraints_file"
 
 # passing settings to bootstrap but should have 0 effect on it

e2e/test_bootstrap_multiple_versions.sh

@@ -10,7 +10,7 @@ source "$SCRIPTDIR/common.sh"
 # Create constraints file with generous ranges to test multiple versions
 # of build dependencies (not just top-level packages)
 constraints_file=$(mktemp)
-trap "rm -f $constraints_file" EXIT
+trap 'rm -f "$constraints_file"; on_exit' EXIT
 cat > "$constraints_file" <<EOF
 # Allow a range of flit-core versions to verify multiple-versions works for dependencies
 flit-core>=3.9,<3.12