Skip to content

Commit

Permalink
Fix integration test failure
Browse files Browse the repository at this point in the history
Test was failing due to wacky merging when dealing with merge conflicts.
Should work now
  • Loading branch information
joereuss12 committed Mar 18, 2024
1 parent 173f5b5 commit a4fd1e1
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions github_scripts/get_put_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ chmod 777 get_put_tmp/origin

# Setup env variables needed
export PELICAN_FEDERATION_DIRECTORURL="https://$HOSTNAME:8444"
export PELICAN_DIRECTOR_DEFAULTRESPONSE="origins"
export PELICAN_FEDERATION_REGISTRYURL="https://$HOSTNAME:8444"
export PELICAN_TLSSKIPVERIFY=true
export PELICAN_ORIGIN_ENABLEDIRECTREADS=true
Expand Down Expand Up @@ -124,7 +123,7 @@ do
done

# Run pelican object put
./pelican object put input.txt pelican://$HOSTNAME:8444/test/input.txt -d -t token -l putOutput.txt
./pelican object put ./get_put_tmp/input.txt pelican://$HOSTNAME:8444/test/input.txt -d -t get_put_tmp/test-token.jwt -l get_put_tmp/putOutput.txt

# Check output of command
if grep -q "Dumping response: HTTP/1.1 200 OK" get_put_tmp/putOutput.txt; then
Expand All @@ -135,7 +134,7 @@ else
exit 1
fi

./pelican object get pelican://$HOSTNAME:8444/test/input.txt output.txt -d -t token -l getOutput.txt
./pelican object get pelican://$HOSTNAME:8444/test/input.txt get_put_tmp/output.txt -d -t get_put_tmp/test-token.jwt -l get_put_tmp/getOutput.txt

# Check output of command
if grep -q "HTTP Transfer was successful" get_put_tmp/getOutput.txt; then
Expand Down

0 comments on commit a4fd1e1

Please sign in to comment.