summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--red.xml2
-rw-r--r--robot/resources/mr_interface.robot8
-rw-r--r--setup.sh14
3 files changed, 18 insertions, 6 deletions
diff --git a/red.xml b/red.xml
index e0d5c957..6690d9dc 100644
--- a/red.xml
+++ b/red.xml
@@ -17,7 +17,7 @@
<referencedLibrary type="PYTHON" name="HEATUtils" path="testsuite/robot/library/eteutils"/>
<referencedLibrary type="PYTHON" name="OSUtils" path="testsuite/robot/library/eteutils"/>
<referencedLibrary type="PYTHON" name="DNSUtils" path="testsuite/robot/library/eteutils"/>
- <referencedLibrary type="PYTHON" name="EteListener" path="testsuite/robot/library/eteutils"/>
+ <referencedLibrary type="PYTHON" name="EteGatherDataListener" path="testsuite/robot/library/eteutils"/>
<referencedLibrary type="PYTHON" name="ArchiveLibrary" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="HeatBridge" path="testsuite/robot/library/heatbridge"/>
<pythonpath>
diff --git a/robot/resources/mr_interface.robot b/robot/resources/mr_interface.robot
index 717fc7c8..1a858f24 100644
--- a/robot/resources/mr_interface.robot
+++ b/robot/resources/mr_interface.robot
@@ -2,22 +2,22 @@
Documentation The main interface for interacting with Message router. It handles low level stuff like managing the http request library and message router required fields
Library RequestsClientCert
Library RequestsLibrary
-Library UUID
+Library UUID
Resource global_properties.robot
*** Variables ***
${MR_HEALTH_CHECK_PATH} /topics
-${MR_ENDPOINT} ${GLOBAL_MR_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MR_IP_ADDR}:${GLOBAL_MR_SERVER_PROTOCOL}
+${MR_ENDPOINT} ${GLOBAL_MR_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MR_IP_ADDR}:${GLOBAL_MR_SERVER_PORT}
*** Keywords ***
Run MR Health Check
[Documentation] Runs MR Health check
- ${resp}= Run MR Get Request ${MR_HEALTH_CHECK_PATH}
+ ${resp}= Run MR Get Request ${MR_HEALTH_CHECK_PATH}
Should Be Equal As Strings ${resp.status_code} 200
Should Contain ${resp.json()} topics
-
+
Run MR Get Request
[Documentation] Runs MR Get request
[Arguments] ${data_path}
diff --git a/setup.sh b/setup.sh
index a12bb634..d89fd02f 100644
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,14 @@
#
# setup : script to setup required runtime environment. This script can be run again to update anything
# this should stay in your project directory
-#
+
+
+# save console output in setup_<timestamp>.log file in project directory
+timestamp=$(date +"%m%d%Y_%H%M%S")
+LOG_FILE=setup_$timestamp.log
+exec > >(tee -a ${LOG_FILE} )
+exec 2> >(tee -a ${LOG_FILE} >&2)
+
# get the path
path=$(pwd)
@@ -58,6 +65,11 @@ pip install --no-cache-dir --upgrade --target="$path/robot/library" ./heatbridge
# https://github.com/robotframework/SSHLibrary/issues/157
pip install --no-cache-dir --target="$path/robot/library" -U 'paramiko==2.0.2'
+
+# Go back to execution folder
+cd $path
+
+
#
# Get the appropriate chromedriver. Default to linux64
#