From 37eeb3877cb2fa7f6482e6b20e22e287b4624945 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 29 May 2021 14:35:13 -0700 Subject: [PATCH] - Removing rtc parts for th pure api testing This does mean we're going to have to rebuild for API + RTC testing but its ok because the two are wholey different feature sets anway --- scripts/run-api-tests.sh | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/scripts/run-api-tests.sh b/scripts/run-api-tests.sh index 4340e5d..6036bc8 100644 --- a/scripts/run-api-tests.sh +++ b/scripts/run-api-tests.sh @@ -1,32 +1,29 @@ #!/bin/bash -# First the rtc server -pushd ./rtc-server/ - echo Setting up RTC server - npm run autotest& - rtc_pid=$! -popd +set -e +export DATABASE_URL=mysql://freechat_dev:password@localhost:3306/freechat # Next the json api pushd ./json-api/ - echo Setting up API server - cargo run --release -- -H ../hmac.secret -w ../wss-hmac.secret -s& + echo Building API server + # Building without rtc support + cargo build --release + # Using the newly built binary directly + echo Running API server + cargo run --release -- -H ../hmac.secret -s& json_pid=$! - sleep 5 # Really high wait time because pipelines be slow as hell sometimes + echo Cargo PID: $json_pid + time=3 + echo Waiting $time seconds for cargo to catch up + sleep $time # Next come back and startup the rest test client - echo Setting up the client itself + echo Setting up client source ./client-tests/bin/activate # Put this in the background in case it errors out + echo Running client python3 client-tests/main.py popd -# Thse probably won't do anything of value in pipelines but hey they work in local -# environments so whatever /shrug -# catch errors that may occur and kill off process group -kill $(pgrep node) kill $(pgrep json) -#trap 'kill $(jobs -p)' EXIT - -echo Done