From 7d91a47ac2b67bbfdeb94c688c9f7ac649e628ba Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Tue, 10 Dec 2024 09:40:06 +1300 Subject: [PATCH] Improve test_blossom --- test_blossom/Example.png | Bin 0 -> 2335 bytes test_blossom/avatar-placeholder.webp | Bin 2446 -> 0 bytes test_blossom/config.toml | 6 +++--- test_blossom/test.sh | 12 +++++++++--- 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 test_blossom/Example.png delete mode 100644 test_blossom/avatar-placeholder.webp diff --git a/test_blossom/Example.png b/test_blossom/Example.png new file mode 100644 index 0000000000000000000000000000000000000000..aa613599201f8ac36246f65c18e760f6f3c82903 GIT binary patch literal 2335 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 diff --git a/test_blossom/config.toml b/test_blossom/config.toml index c6b2f8f..fb49bb3 100644 --- a/test_blossom/config.toml +++ b/test_blossom/config.toml @@ -25,9 +25,9 @@ allow_scrape_if_max_seconds = 7200 max_subscriptions = 128 serve_ephemeral = true serve_relay_lists = true -server_log_level = "Info" -library_log_level = "Info" -client_log_level = "Warn" +server_log_level = "Debug" +library_log_level = "Debug" +client_log_level = "Debug" enable_ip_blocking = true minimum_ban_seconds = 1 timeout_seconds = 60 diff --git a/test_blossom/test.sh b/test_blossom/test.sh index 7ef675b..587b703 100755 --- a/test_blossom/test.sh +++ b/test_blossom/test.sh @@ -20,20 +20,23 @@ fi # UPLOAD TEST ------------ -FILE="./avatar-placeholder.webp" +FILE="./Example.png" HASH=$(sha256sum $FILE | awk '{print $1}') # Generate nostr auth AUTH=$(./create_auth.sh upload $HASH) -# Upload -DESCRIPTOR=$(curl -s --data-binary @"$FILE" -X PUT --header "$AUTH" http://127.0.0.1:8089/upload) +# Upload (note we clobber the content type) +DESCRIPTOR=$(curl -vfs --data-binary @"$FILE" -H "Content-Type: " -X PUT --header "$AUTH" http://127.0.0.1:8089/upload) if [ $? -ne 0 ] ; then echo "FAILED: Curl (uploading) exited with a non-zero status" exit 1 fi echo "PASS: FILE UPLOADED" +## FIXME check for 4xx and 5xx error codes + + # Extract the sha256 and compare it DHASH=$(echo "$DESCRIPTOR" | jq -r .sha256) if [ $? -ne 0 ] ; then @@ -42,6 +45,7 @@ if [ $? -ne 0 ] ; then fi if [ "$HASH" != "$DHASH" ] ; then echo "returned descriptor 'sha256' does not match the hash" + exit 1 fi echo "PASS: DESCRIPTOR HASH MATCHES" @@ -52,6 +56,8 @@ if [ $? -ne 0 ] ; then exit 1 fi +echo "Descriptor URL = $URL" + # DOWNLOAD TEST ----------- curl -s "$URL" > downloaded