From aa8cbbaba20de8ce8a63139e52f32490eab246cd Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Fri, 15 Nov 2024 15:07:38 -0800 Subject: [PATCH] test host --- .../IntegrationTestAutoReconnectResubscribe.py | 4 ++-- .../IntegrationTests/TestToolLibrary/checkInManager.py | 2 +- test-integration/run/run.sh | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test-integration/IntegrationTests/IntegrationTestAutoReconnectResubscribe.py b/test-integration/IntegrationTests/IntegrationTestAutoReconnectResubscribe.py index 83b66c2..e6c1bee 100644 --- a/test-integration/IntegrationTests/IntegrationTestAutoReconnectResubscribe.py +++ b/test-integration/IntegrationTests/IntegrationTestAutoReconnectResubscribe.py @@ -135,14 +135,14 @@ def threadBRuntime(self, pyCoreClient, callback): ############################################################################ # Main # # Check inputs -myCheckInManager = checkInManager.checkInManager(1) +myCheckInManager = checkInManager.checkInManager(2) myCheckInManager.verify(sys.argv) -host = "ajje7lpljulm4-ats.iot.us-east-1.amazonaws.com" rootCA = "./test-integration/Credentials/rootCA.crt" certificate = "./test-integration/Credentials/certificate.pem.crt" privateKey = "./test-integration/Credentials/privateKey.pem.key" mode = myCheckInManager.mode +host = myCheckInManager.host skip_when_match(ModeIsALPN(mode).And( Python2VersionLowerThan((2, 7, 10)).Or(Python3VersionLowerThan((3, 5, 0))) diff --git a/test-integration/IntegrationTests/TestToolLibrary/checkInManager.py b/test-integration/IntegrationTests/TestToolLibrary/checkInManager.py index 7115138..aeeedd9 100644 --- a/test-integration/IntegrationTests/TestToolLibrary/checkInManager.py +++ b/test-integration/IntegrationTests/TestToolLibrary/checkInManager.py @@ -16,5 +16,5 @@ def verify(self, args): exit(4) self.mode = str(args[1]) self.host = str(args[2]) - if self._numberOfInputParameters + 1 > 2: + if self._numberOfInputParameters + 1 > 3: self.customParameter = int(args[3]) diff --git a/test-integration/run/run.sh b/test-integration/run/run.sh index 28b9008..1f06a6f 100755 --- a/test-integration/run/run.sh +++ b/test-integration/run/run.sh @@ -51,7 +51,8 @@ CREDENTIAL_DIR="./test-integration/Credentials/" TEST_DIR="./test-integration/IntegrationTests/" CA_CERT_URL="https://www.amazontrust.com/repository/AmazonRootCA1.pem" CA_CERT_PATH=${CREDENTIAL_DIR}rootCA.crt -Host=$(python ${RetrieveAWSKeys} ${AWSHost}) +TestHost=$(python ${RetrieveAWSKeys} ${AWSHost}) +echo ${TestHost} @@ -145,7 +146,7 @@ else "IntegrationTestJobsClient.py") Scale="" esac - python ${TEST_DIR}${file} ${TestMode} ${Host} ${Scale} + python ${TEST_DIR}${file} ${TestMode} ${TestHost} ${Scale} currentTestStatus=$? echo "[SUB] Test: ${file} completed. Exiting with status: ${currentTestStatus}" if [ ${currentTestStatus} -ne 0 ]; then