aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-10-19 04:02:46 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-19 04:02:46 +0000
commitda9baba4a76e74c539d738a777b289171a743964 (patch)
tree171e224e608a387c83d5be0d7a3f1b17d81e7d32
parente88b827e9ac4c9b8198813e0e413661b39ec7b2b (diff)
parent4089a3374972aa8cb2264dbf1477ad5e9066a2b1 (diff)
Merge "Updated setup.sh and test1.robot"
-rw-r--r--test/csit/plans/portal/testsuite/setup.sh6
-rw-r--r--test/csit/tests/portal/testsuites/test1.robot17
2 files changed, 13 insertions, 10 deletions
diff --git a/test/csit/plans/portal/testsuite/setup.sh b/test/csit/plans/portal/testsuite/setup.sh
index ff21142af..456a9343d 100644
--- a/test/csit/plans/portal/testsuite/setup.sh
+++ b/test/csit/plans/portal/testsuite/setup.sh
@@ -68,7 +68,7 @@ source $CURR/.env
# Make inter-app communication work in CSIT
export EXTRA_HOST_IP="-i ${HOST_IP}"
-export EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org"
+export EXTRA_HOST_NAME="-n portal.api.simpledemo.onap.org"
# Copy property files to new directory
@@ -107,7 +107,7 @@ docker-compose up -d
# insert/update hosts entry
ip_address=$HOST_IP
-host_name="portal.api.simpledemo.openecomp.org"
+host_name="portal.api.simpledemo.onap.org"
# find existing instances in the host file and save the line numbers
matches_in_hosts="$(grep -n $host_name /etc/hosts | cut -f1 -d:)"
host_entry="${ip_address} ${host_name}"
@@ -137,7 +137,7 @@ TIME_OUT=500
INTERVAL=20
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/portalApi/healthCheck); echo $response
+ response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/portalApi/healthCheck); echo $response
if [ "$response" == "200" ]; then
echo Portal and its database well started in $TIME seconds
diff --git a/test/csit/tests/portal/testsuites/test1.robot b/test/csit/tests/portal/testsuites/test1.robot
index 42f88bf39..2fdf9d49f 100644
--- a/test/csit/tests/portal/testsuites/test1.robot
+++ b/test/csit/tests/portal/testsuites/test1.robot
@@ -14,9 +14,8 @@ Resource json_templater.robot
*** Variables ***
-#${PORTAL_URL} http://localhost:8989
-${PORTAL_URL} http://portal.api.simpledemo.openecomp.org:8989
-${PORTAL_ENV} /ECOMPPORTAL
+${PORTAL_URL} http://portal.api.simpledemo.onap.org:8989
+${PORTAL_ENV} /ONAPPORTAL
${PORTAL_LOGIN_URL} ${PORTAL_URL}${PORTAL_ENV}/login.htm
${PORTAL_HOME_PAGE} ${PORTAL_URL}${PORTAL_ENV}/applicationsHome
${PORTAL_MICRO_ENDPOINT} ${PORTAL_URL}${PORTAL_ENV}/commonWidgets
@@ -40,7 +39,7 @@ ${Test_LoginID} portal
${Test_Loginpwd} demo123456!
${Test_LoginPwdCheck} demo123456!
${Existing_User} portal
-${PORTAL_HEALTH_CHECK_PATH} /ECOMPPORTAL/portalApi/healthCheck
+${PORTAL_HEALTH_CHECK_PATH} /ONAPPORTAL/portalApi/healthCheck
${PORTAL_ASSETS_DIRECTORY} ${CURDIR}
${GLOBAL_APPLICATION_ID} robot-functional
${GLOBAL_PORTAL_ADMIN_USER} demo
@@ -60,7 +59,7 @@ ${GLOBAL_OPENSTACK_KEYSTONE_SERVICE_TYPE} identity
${GLOBAL_BUILD_NUMBER} 0
${GLOBAL_VM_PRIVATE_KEY} ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pvt
${jira} jira
-${RESOURCE_PATH} ECOMPPORTAL/auxapi/ticketevent
+${RESOURCE_PATH} ONAPPORTAL/auxapi/ticketevent
${portal_Template} ${CURDIR}/portal.template
@@ -886,9 +885,13 @@ Application admin Delete Standard User Existing user
Application admin Logout from Portal GUI
[Documentation] Logout from Portal GUI
Click Element xpath=//div[@id='header-user-icon']
+ Set Selenium Implicit Wait 3000
Click Button xpath=//button[contains(.,'Log out')]
- #Confirm Action
- Title Should Be Login
+ Set Selenium Implicit Wait 3000
+ Title Should Be Login
+
+
+
Standared user Login To Portal GUI