diff --git a/integration_tests/bin/blockstack-browser-test-mode.sh b/integration_tests/bin/blockstack-browser-test-mode.sh index c8865d2a0..00e5df50d 100755 --- a/integration_tests/bin/blockstack-browser-test-mode.sh +++ b/integration_tests/bin/blockstack-browser-test-mode.sh @@ -1,11 +1,11 @@ #!/bin/bash -# launcher for browser/portal +# launcher for browser -PORTAL_DIR='/tmp/blockstack-portal' -if ! [ -d "$PORTAL_DIR" ]; then +BROWSER_DIR='/tmp/blockstack-browser' +if ! [ -d "$BROWSER_DIR" ]; then echo "" - echo "Missing $PORTAL_DIR" + echo "Missing $BROWSER_DIR" echo "Please make sure Blockstack Browser is available in that directory" echo "(https://github.com/blockstack/blockstack-browser)" echo "" @@ -16,9 +16,13 @@ TEST_PID= DEV_PROXY_PID= # start environment +# override RPC port export BLOCKSTACK_TEST_CLIENT_RPC_PORT=6270 -blockstack-test-scenario --interactive-web 3001 blockstack_integration_tests.scenarios.portal_empty_namespace 2>&1 | tee portal_test.log & +# tell the RPC system to encode all addresses to mainnet, even though we're in testing +export BLOCKSTACK_RPC_MOCK_BLOCKCHAIN_NETWORK="mainnet" + +blockstack-test-scenario --interactive-web 3001 blockstack_integration_tests.scenarios.portal_empty_namespace 2>&1 | tee browser_test.log & TEST_PID=$! # wait for it to begin serving @@ -31,12 +35,12 @@ while true; do fi done -pushd "$PORTAL_DIR" >/dev/null +pushd "$BROWSER_DIR" >/dev/null echo "" echo "Starting Browser CORS proxy" echo "" -npm run dev-proxy 2>&1 | tee "$PORTAL_DIR/cors-proxy.log" & +npm run dev-proxy 2>&1 | tee "$BROWSER_DIR/cors-proxy.log" & DEV_PROXY_PID=$! sleep 5