From c044f1669a51128a0a5f85c5e71422d4b6052f08 Mon Sep 17 00:00:00 2001 From: Lukasz Piatkowski Date: Thu, 10 Sep 2020 01:55:22 -0700 Subject: [PATCH] mononoke/integration tests: deal with bash issues on tests (#50) 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: https://github.com/facebookexperimental/eden/pull/50 Reviewed By: krallin Differential Revision: D23599695 Pulled By: lukaspiatkowski fbshipit-source-id: e2736cee62e82d1e9da6eaf16ef0f2c65d3d8930 --- .github/workflows/mononoke-integration_linux.yml | 3 +++ .github/workflows/mononoke-integration_mac.yml | 2 +- eden/mononoke/tests/integration/run_tests_getdeps.py | 3 +-- .../tests/integration/test-lfs-server-proxy-skip-upstream.t | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mononoke-integration_linux.yml b/.github/workflows/mononoke-integration_linux.yml index 44fb29b6b5f0e..c31b49897299b 100644 --- a/.github/workflows/mononoke-integration_linux.yml +++ b/.github/workflows/mononoke-integration_linux.yml @@ -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 diff --git a/.github/workflows/mononoke-integration_mac.yml b/.github/workflows/mononoke-integration_mac.yml index 57fb0bafbaf41..5a733d80206b2 100644 --- a/.github/workflows/mononoke-integration_mac.yml +++ b/.github/workflows/mononoke-integration_mac.yml @@ -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 diff --git a/eden/mononoke/tests/integration/run_tests_getdeps.py b/eden/mononoke/tests/integration/run_tests_getdeps.py index 67c11b8f44b1a..5598994d7d91d 100755 --- a/eden/mononoke/tests/integration/run_tests_getdeps.py +++ b/eden/mononoke/tests/integration/run_tests_getdeps.py @@ -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 @@ -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 diff --git a/eden/mononoke/tests/integration/test-lfs-server-proxy-skip-upstream.t b/eden/mononoke/tests/integration/test-lfs-server-proxy-skip-upstream.t index 9098252d7c56e..855ea6ac9e1de 100644 --- a/eden/mononoke/tests/integration/test-lfs-server-proxy-skip-upstream.t +++ b/eden/mononoke/tests/integration/test-lfs-server-proxy-skip-upstream.t @@ -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