From 1788a9ae85c6be7bb2d1c6354e4e474132df7eb4 Mon Sep 17 00:00:00 2001
From: karnem <mikhail.karnevskiy@desy.de>
Date: Tue, 18 Jul 2023 15:25:39 +0200
Subject: [PATCH] Fix address to be compatible with asapo standalone used for
tests.
---
.../curl_http_client_command/check_linux.sh | 2 +-
.../rest_api/check_linux.sh | 18 +++++++++---------
.../automatic/mongo_db/connect/CMakeLists.txt | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tests/automatic/curl_http_client/curl_http_client_command/check_linux.sh b/tests/automatic/curl_http_client/curl_http_client_command/check_linux.sh
index 44935e94b..ceb5e8740 100644
--- a/tests/automatic/curl_http_client/curl_http_client_command/check_linux.sh
+++ b/tests/automatic/curl_http_client/curl_http_client_command/check_linux.sh
@@ -17,7 +17,7 @@ echo -n hello > $file_transfer_folder/aaa
dd if=/dev/urandom of=$file_transfer_folder/random bs=1 count=100000
-$1 127.0.0.1:5007 127.0.0.1:5008 $file_transfer_folder
+$1 127.0.0.1:8412 127.0.0.1:8414 $file_transfer_folder
cat bbb | tee /dev/stderr | grep hello
diff -q random $file_transfer_folder/random
diff --git a/tests/automatic/file_transfer_service/rest_api/check_linux.sh b/tests/automatic/file_transfer_service/rest_api/check_linux.sh
index edd061643..11117a650 100644
--- a/tests/automatic/file_transfer_service/rest_api/check_linux.sh
+++ b/tests/automatic/file_transfer_service/rest_api/check_linux.sh
@@ -16,39 +16,39 @@ mkdir -p $file_transfer_folder
token=$BT_AAA_TOKEN
-folder_token=`curl --silent --data "{\"Folder\":\"$file_transfer_folder\",\"BeamtimeId\":\"aaa\",\"Token\":\"$token\"}" 127.0.0.1:5007/v0.1/folder`
+folder_token=`curl --silent --data "{\"Folder\":\"$file_transfer_folder\",\"BeamtimeId\":\"aaa\",\"Token\":\"$token\"}" 127.0.0.1:8412/v0.1/folder`
echo $folder_token
dd if=/dev/urandom of=$file_transfer_folder/aaa bs=1 count=100000
-curl -o aaa --silent -H "Authorization: Bearer ${folder_token}" --data "{\"Folder\":\"$file_transfer_folder\",\"FileName\":\"aaa\",\"Token\":\"$folder_token\"}" 127.0.0.1:5008/v0.1/transfer --stderr - | tee /dev/stderr
+curl -o aaa --silent -H "Authorization: Bearer ${folder_token}" --data "{\"Folder\":\"$file_transfer_folder\",\"FileName\":\"aaa\",\"Token\":\"$folder_token\"}" 127.0.0.1:8414/v0.1/transfer --stderr - | tee /dev/stderr
-curl -H "Authorization: Bearer ${folder_token}" --data "{\"Folder\":\"$file_transfer_folder\",\"FileName\":\"aaa\",\"Token\":\"$folder_token\"}" 127.0.0.1:5008/v0.1/transfer?sizeonly=true --stderr - | tee /dev/stderr | grep 100000
+curl -H "Authorization: Bearer ${folder_token}" --data "{\"Folder\":\"$file_transfer_folder\",\"FileName\":\"aaa\",\"Token\":\"$folder_token\"}" 127.0.0.1:8414/v0.1/transfer?sizeonly=true --stderr - | tee /dev/stderr | grep 100000
diff -q aaa $file_transfer_folder/aaa
# auto folder
-folder_token_auto=`curl --silent --data "{\"Folder\":\"auto\",\"BeamtimeId\":\"aaa\",\"Token\":\"$token\"}" 127.0.0.1:5007/v0.2/folder`
+folder_token_auto=`curl --silent --data "{\"Folder\":\"auto\",\"BeamtimeId\":\"aaa\",\"Token\":\"$token\"}" 127.0.0.1:8412/v0.2/folder`
echo $folder_token_auto
-curl -o aaa1 --silent -H "Authorization: Bearer ${folder_token_auto}" --data "{\"FileName\":\"aaa\",\"Token\":\"$folder_token_auto\"}" 127.0.0.1:5008/v0.2/transfer --stderr - | tee /dev/stderr
+curl -o aaa1 --silent -H "Authorization: Bearer ${folder_token_auto}" --data "{\"FileName\":\"aaa\",\"Token\":\"$folder_token_auto\"}" 127.0.0.1:8414/v0.2/transfer --stderr - | tee /dev/stderr
diff -q aaa1 $file_transfer_folder/aaa
#auto folder, old protocol
-curl --silent --data "{\"Folder\":\"auto\",\"BeamtimeId\":\"aaa\",\"Token\":\"$token\"}" 127.0.0.1:5007/v0.1/folder | grep "auto does not match"
-curl --silent -H "Authorization: Bearer ${folder_token_auto}" --data "{\"FileName\":\"aaa\",\"Token\":\"$folder_token_auto\"}" 127.0.0.1:5008/v0.1/transfer --stderr - | tee /dev/stderr | grep forbidden
+curl --silent --data "{\"Folder\":\"auto\",\"BeamtimeId\":\"aaa\",\"Token\":\"$token\"}" 127.0.0.1:8412/v0.1/folder | grep "auto does not match"
+curl --silent -H "Authorization: Bearer ${folder_token_auto}" --data "{\"FileName\":\"aaa\",\"Token\":\"$folder_token_auto\"}" 127.0.0.1:8414/v0.1/transfer --stderr - | tee /dev/stderr | grep forbidden
exit 0
chmod -r $file_transfer_folder/aaa
-curl --silent -H "Authorization: Bearer ${folder_token}" --data "{\"Folder\":\"$file_transfer_folder\",\"FileName\":\"aaa\",\"Token\":\"$folder_token\"}" 127.0.0.1:5008/v0.1/transfer?sizeonly=true --stderr - | tee /dev/stderr | grep "does not exist"
+curl --silent -H "Authorization: Bearer ${folder_token}" --data "{\"Folder\":\"$file_transfer_folder\",\"FileName\":\"aaa\",\"Token\":\"$folder_token\"}" 127.0.0.1:8414/v0.1/transfer?sizeonly=true --stderr - | tee /dev/stderr | grep "does not exist"
dd if=/dev/zero of=$file_transfer_folder/big_file bs=1 count=0 seek=5368709120
-curl -vvv -o big_file -H "Authorization: Bearer ${folder_token}" --data "{\"Folder\":\"$file_transfer_folder\",\"FileName\":\"big_file\",\"Token\":\"$folder_token\"}" 127.0.0.1:5008/v0.1/transfer --stderr - | tee /dev/stderr
+curl -vvv -o big_file -H "Authorization: Bearer ${folder_token}" --data "{\"Folder\":\"$file_transfer_folder\",\"FileName\":\"big_file\",\"Token\":\"$folder_token\"}" 127.0.0.1:8414/v0.1/transfer --stderr - | tee /dev/stderr
ls -ln big_file | awk '{ print $5 }' | tee /dev/stderr | grep 5368709120
diff --git a/tests/automatic/mongo_db/connect/CMakeLists.txt b/tests/automatic/mongo_db/connect/CMakeLists.txt
index 03b196bd3..71c77a5ef 100644
--- a/tests/automatic/mongo_db/connect/CMakeLists.txt
+++ b/tests/automatic/mongo_db/connect/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
################################
add_integration_test(${TARGET_NAME} connectOK "127.0.0.1 data test OK")
-add_integration_test(${TARGET_NAME} connectFAILS "127.0.0.0 data test Connectionerror")
+add_integration_test(${TARGET_NAME} connectFAILS "123.0.0.0 data test Connectionerror")
add_integration_test(${TARGET_NAME} connectBadAddress "#?ß// data test Badaddress")
--
GitLab