commit 8d69338ff63a1b8a8e207c5836f5bb3801e95632
author George Keishing <gkeishin@in.ibm.com> Tue Dec 18 12:15:04 2018 -0600
committer George Keishing <gkeishin@in.ibm.com> Tue Dec 18 12:17:48 2018 -0600
tree c6b2df52db33020147958ce5b558c94d0e209664
parent 20f3bf739b0ab1818813eb895739ce06265fcb87

Fix trailing slashes in URI path

Change-Id: Iade8beb7e451df33bb3a7deb4dfa331e554fb89f
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

data/variables.py

diff --git a/data/variables.py b/data/variables.py
index ba8e088..9f0d6de 100755
--- a/data/variables.py
+++ b/data/variables.py
@@ -87,7 +87,7 @@
 ALWAYS_POWER_OFF = CONTROL_DBUS_BASE + 'Power.RestorePolicy.Policy.AlwaysOff'
 
 # Dump URI variables.
-DUMP_URI = OPENBMC_BASE_URI + '/dump/'
+DUMP_URI = OPENBMC_BASE_URI + 'dump/'
 DUMP_ENTRY_URI = DUMP_URI + 'entry/'
 # The path on the BMC where dumps are stored.
 DUMP_DIR_PATH = "/var/lib/phosphor-debug-collector/dumps/"

lib/dump_utils.robot

diff --git a/lib/dump_utils.robot b/lib/dump_utils.robot
index 7551e7d..778d089 100644
--- a/lib/dump_utils.robot
+++ b/lib/dump_utils.robot
@@ -13,7 +13,7 @@
 
     ${data}=  Create Dictionary  data=@{EMPTY}
     ${resp}=  OpenBMC Post Request
-    ...  ${DUMP_URI}/action/CreateDump  data=${data}
+    ...  ${DUMP_URI}action/CreateDump  data=${data}
 
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
     ${json}=  To JSON  ${resp.content}
@@ -50,7 +50,7 @@
     # dump_id  An integer value that identifies a particular dump
     #          object(e.g. 1, 3, 5).
 
-    ${resp}=  OpenBMC Get Request  ${DUMP_ENTRY_URI}/${dump_id}
+    ${resp}=  OpenBMC Get Request  ${DUMP_ENTRY_URI}${dump_id}
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
 
 
@@ -63,7 +63,7 @@
 
     ${data}=  Create Dictionary  data=@{EMPTY}
     ${resp}=  OpenBMC Post Request
-    ...  ${DUMP_ENTRY_URI}/${dump_id}/action/Delete  data=${data}
+    ...  ${DUMP_ENTRY_URI}${dump_id}/action/Delete  data=${data}
 
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
 
@@ -91,7 +91,7 @@
 Dump Should Not Exist
     [Documentation]  Verify that BMC dumps do not exist.
 
-    ${resp}=  OpenBMC Get Request  ${DUMP_ENTRY_URI}/list  quiet=${1}
+    ${resp}=  OpenBMC Get Request  ${DUMP_ENTRY_URI}list  quiet=${1}
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_NOT_FOUND}
 
 Check Existence of BMC Dump file

tests/test_xit.robot

diff --git a/tests/test_xit.robot b/tests/test_xit.robot
index 46ddf8e..4c39ab0 100644
--- a/tests/test_xit.robot
+++ b/tests/test_xit.robot
@@ -23,6 +23,6 @@
     [Documentation]  Verify no BMC dump exist.
     [Tags]  Verify_No_BMC_Dump
 
-    ${resp}=  OpenBMC Get Request  ${DUMP_ENTRY_URI}/list
+    ${resp}=  OpenBMC Get Request  ${DUMP_ENTRY_URI}list
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_NOT_FOUND}
     ...  msg=BMC dump(s) were not deleted as expected.