Skip to content

Commit

Permalink
mononoke/integration tests: deal with bash issues on tests (#50)
Browse files Browse the repository at this point in the history
Summary:
One test was fixed earlier by switching MacOS to use modern version of bash, the other is fixed here by installing "nmap" and using "ncat" from within it on both linux and mac.

Pull Request resolved: #50

Reviewed By: krallin

Differential Revision: D23599695

Pulled By: lukaspiatkowski

fbshipit-source-id: e2736cee62e82d1e9da6eaf16ef0f2c65d3d8930
  • Loading branch information
lukaspiatkowski authored and facebook-github-bot committed Sep 10, 2020
1 parent 86c4677 commit c044f16
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/mononoke-integration_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: '2.7'
- name: Install Apt-get dependencies
run: |
sudo apt-get install nmap
- name: Install system deps
run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
- name: Build eden_scm dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mononoke-integration_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
python-version: '2.7'
- name: Install Brew dependencies
run: |
brew install bash coreutils curl-openssl gnu-sed grep jq
brew install bash coreutils curl-openssl gnu-sed grep jq nmap
- name: Install system deps
run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
- name: Build eden_scm dependencies
Expand Down
3 changes: 1 addition & 2 deletions eden/mononoke/tests/integration/run_tests_getdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"test-gitimport.t", # Issue with hggit extension
"test-hook-tailer.t", # Issue with hggit extension
"test-infinitepush-lfs.t", # Timed out
"test-large-path-and-content.t", # Complex bash issues
"test-large-path-and-content.t", # # Timed out
"test-lfs-copytracing.t", # Timed out
"test-lfs-server-acl-check.t", # Timed out
"test-lfs-server-consistent-hashing.t", # Timed out
Expand All @@ -96,7 +96,6 @@
"test-lfs-server-identity-parsing-untrusted.t", # Timed out
"test-lfs-server-identity-parsing.t", # Timed out
"test-lfs-server-max-upload-size.t", # Timed out
"test-lfs-server-proxy-skip-upstream.t", # Complex bash issues
"test-lfs-server-proxy-sync.t", # Timed out
"test-lfs-server-proxy.t", # Timed out
"test-lfs-server-rate-limiting.t", # Timed out
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Start a "server" that never responds as the upstream
$ upstream_port="$(get_free_socket)"
$ upstream="http://127.0.0.1:${upstream_port}/"
$ nc --sh-exec "sleep 1" --keep-open --listen 127.0.0.1 "$upstream_port" &
$ ncat --sh-exec "sleep 1" --keep-open --listen 127.0.0.1 "$upstream_port" &
$ nc_pid="$!"

# Start a LFS server
Expand Down

0 comments on commit c044f16

Please sign in to comment.