fix local server test scripts (#2054)

# Testing

1. In one console:
    ```
    tournament/scripts/demo/server-native.sh
    ```
2. In another console:
    ```
    tournament/scripts/database/recreate-local-database.sh
    tournament/scripts/demo/client/test-cases/local/good-submit.sh
    ```
This commit is contained in:
Karl Ostmo 2024-07-17 07:53:56 -07:00 committed by GitHub
parent e16283ad5c
commit ff8fdaa8e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 4 deletions

View File

@ -14,7 +14,7 @@ SCENARIO_DATA_DIR=data/scenarios
PORT=8080
BASE_API_URL=http://localhost:$PORT
SCENARIO_UPLOAD_URL=$BASE_API_URL/upload/scenario
SCENARIO_UPLOAD_URL=$BASE_API_URL/api/private/upload/scenario
SCENARIO_FILEPATH=$SCENARIO_DATA_DIR/Challenges/arbitrage.yaml
SCENARIO_HASH=$(curl --silent -F "my_file=@$SCENARIO_FILEPATH" $SCENARIO_UPLOAD_URL | jq -r .scenarioFileMetadata.fileHash)

View File

@ -0,0 +1,13 @@
#!/bin/bash -ex
cd $(git rev-parse --show-toplevel)
DEFAULT_COOKIE_JAR_PATH=/tmp/cookies.txt
COOKIE_JAR_PATH=${1:-$DEFAULT_COOKIE_JAR_PATH}
PORT=8080
BASE_API_URL=http://localhost:$PORT
LOGIN_URL=$BASE_API_URL/api/private/login/local
curl --silent --include --cookie-jar $COOKIE_JAR_PATH $LOGIN_URL

View File

@ -26,10 +26,17 @@ SOLUTION_FILEPATH=$3
cd $(git rev-parse --show-toplevel)
BASE_UPLOAD_URL=http://$HOST/upload
BASE_UPLOAD_URL=http://$HOST/api/private/upload
SCENARIO_UPLOAD_URL=$BASE_UPLOAD_URL/scenario
SCENARIO_HASH=$(curl --silent -F "my_file=@$SCENARIO_FILEPATH" $SCENARIO_UPLOAD_URL | jq -r .scenarioFileMetadata.fileHash)
COOKIE_JAR_FILE=$(mktemp --suffix .cookies)
tournament/scripts/demo/client/login.sh $COOKIE_JAR_FILE
SCENARIO_HASH=$(curl --silent --cookie $COOKIE_JAR_FILE -F "my_file=@$SCENARIO_FILEPATH" $SCENARIO_UPLOAD_URL | jq -r .scenarioFileMetadata.fileHash)
SOLUTION_UPLOAD_URL=$BASE_UPLOAD_URL/solution
curl --silent -F "scenario=$SCENARIO_HASH" -F "my_file=@$SOLUTION_FILEPATH" $SOLUTION_UPLOAD_URL
curl --silent --cookie $COOKIE_JAR_FILE -F "scenario=$SCENARIO_HASH" -F "my_file=@$SOLUTION_FILEPATH" $SOLUTION_UPLOAD_URL
rm $COOKIE_JAR_FILE