Skip to content

Commit 970c52e

Browse files
committed
fix: tests looking for packages with wrong name
Some of the dependencies for some of our test packages end up with different case output files on different platforms. This change updates those tests to look for the files using either mixed or all-lowercase letters.
1 parent e1b03dc commit 970c52e

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

e2e/test_bootstrap_extras.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ $OUTDIR/sdists-repo/downloads/setuptools-*.tar.gz
3939
$OUTDIR/sdists-repo/builds/setuptools-*.tar.gz
4040
$OUTDIR/work-dir/setuptools-*/build.log
4141
42-
$OUTDIR/wheels-repo/downloads/PySocks-*.whl
43-
$OUTDIR/sdists-repo/downloads/PySocks-*.tar.gz
44-
$OUTDIR/sdists-repo/builds/pysocks-*.tar.gz
42+
$OUTDIR/wheels-repo/downloads/[Pp]y[sS]ocks-*.whl
43+
$OUTDIR/sdists-repo/downloads/[Pp]y[sS]ocks-*.tar.gz
44+
$OUTDIR/sdists-repo/builds/[Pp]y[sS]ocks-*.tar.gz
4545
$OUTDIR/work-dir/pysocks-*/build.log
4646
"
4747

e2e/test_elfdeps.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ PYVER=$(python3 -c 'import sys; print("%s%s" % sys.version_info[:2])')
2525
EXTRACTDIR="$OUTDIR/extract"
2626
mkdir -p "$EXTRACTDIR"
2727

28-
WHL=wheels-repo/downloads/${DIST}-${VERSION}-0-cp${PYVER}-cp${PYVER}-${WHEEL_PLATFORM_TAG}.whl
29-
unzip "$OUTDIR/$WHL" -d "$EXTRACTDIR"
28+
MIXED_CASE_DIST="[Mm]arkup[Ss]afe"
29+
WHL="wheels-repo/downloads/${MIXED_CASE_DIST}-${VERSION}-0-cp${PYVER}-cp${PYVER}-${WHEEL_PLATFORM_TAG}.whl"
30+
unzip $OUTDIR/$WHL -d "$EXTRACTDIR"
3031

31-
DIST_INFO="extract/${DIST}-${VERSION}.dist-info"
32+
DIST_INFO="extract/${MIXED_CASE_DIST}-${VERSION}.dist-info"
3233

3334
EXPECTED_FILES="
3435
$WHL
35-
sdists-repo/downloads/${DIST}-${VERSION}.tar.gz
36+
sdists-repo/downloads/${MIXED_CASE_DIST}-${VERSION}.tar.gz
3637
$DIST_INFO/fromager-build-backend-requirements.txt
3738
$DIST_INFO/fromager-build-sdist-requirements.txt
3839
$DIST_INFO/fromager-build-settings
@@ -48,7 +49,7 @@ fi
4849

4950
pass=true
5051
for f in $EXPECTED_FILES; do
51-
if [ ! -f "$OUTDIR/$f" ]; then
52+
if [ ! -f $OUTDIR/$f ]; then
5253
echo "FAIL: Did not find $OUTDIR/$f" 1>&2
5354
pass=false
5455
fi

0 commit comments

Comments
 (0)