Skip to content

Commit 8a093fc

Browse files
authored
Merge pull request #923 from LalatenduMohanty/fix-macos-wheel-server-ip
fix(e2e): use 127.0.0.1 for local wheel server on macOS
2 parents 52b770c + d801a33 commit 8a093fc

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

e2e/common.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ start_local_wheel_server() {
7373
python3 -m http.server --directory "$serve_dir" 9999 &
7474
HTTP_SERVER_PID=$!
7575
if which ip 2>&1 >/dev/null; then
76-
# Linux
76+
# Linux: need host IP because podman can't reach localhost
7777
IP=$(ip route get 1.1.1.1 | grep 1.1.1.1 | awk '{print $7}')
7878
else
79-
# macOS
80-
IP=$(ipconfig getifaddr en0)
79+
# macOS: no network isolation, localhost works
80+
IP=127.0.0.1
8181
fi
8282
export WHEEL_SERVER_URL="http://${IP}:9999/simple"
8383
}

e2e/test_bootstrap_conflicting_requirements.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ source "$SCRIPTDIR/common.sh"
1313
# expected pbr version
1414
constraints_file=$(mktemp)
1515
trap "rm -f $constraints_file" EXIT
16-
echo "pbr==6.1.1" > "$constraints_file"
16+
echo "pbr==7.0.3" > "$constraints_file"
1717

1818
# passing settings to bootstrap but should have 0 effect on it
1919
fromager \
@@ -47,7 +47,7 @@ $pass
4747
# packages should be written to the constraints file. Conflicting packages
4848
# (stevedore versions) should be excluded entirely.
4949
EXPECTED_LINES="
50-
pbr==6.1.1
50+
pbr==7.0.3
5151
"
5252

5353
SHOULD_NOT_BE_PRESENT="

0 commit comments

Comments
 (0)