aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap/tests
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2017-12-07 11:54:59 -0800
committerVictor Morales <victor.morales@intel.com>2017-12-07 12:04:22 -0800
commit5d21f64981e69f6a266da1ec30754de5d8d71e26 (patch)
tree2ac623262e3aabd9238df22af63149405b1d9fa1 /bootstrap/vagrant-onap/tests
parent303a016e7c35d988add1838faad37f4d0432bc00 (diff)
Fix Robot UTs
The way to clone robot source code repos was depending on the name of the project, but given that robot repos name has different name it was required to handle this exception. This change include Change-Id: If0f4b1cd7866944166b1e81ed417176049251370 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: INT-19
Diffstat (limited to 'bootstrap/vagrant-onap/tests')
-rwxr-xr-xbootstrap/vagrant-onap/tests/test_msb4
-rwxr-xr-xbootstrap/vagrant-onap/tests/test_robot24
2 files changed, 14 insertions, 14 deletions
diff --git a/bootstrap/vagrant-onap/tests/test_msb b/bootstrap/vagrant-onap/tests/test_msb
index d8784ce7b..e8bb24606 100755
--- a/bootstrap/vagrant-onap/tests/test_msb
+++ b/bootstrap/vagrant-onap/tests/test_msb
@@ -36,7 +36,7 @@ function test_get_msb_images {
get_msb_images
for image in base apigateway discovery; do
- asserts_image nexus3.onap.org:10001/onap/msb/msb_$image
+ asserts_image $nexus_docker_repo/onap/msb/msb_$image
done
}
@@ -47,7 +47,7 @@ function test_install_msb {
install_msb
for image in apigateway discovery; do
- asserts_image_running nexus3.onap.org:10001/onap/msb/msb_$image
+ asserts_image_running $nexus_docker_repo/onap/msb/msb_$image
done
asserts_http_status_code "http://127.0.0.1:10081/api/microservices/v1/services"
diff --git a/bootstrap/vagrant-onap/tests/test_robot b/bootstrap/vagrant-onap/tests/test_robot
index 87ee100c1..dcaf7b286 100755
--- a/bootstrap/vagrant-onap/tests/test_robot
+++ b/bootstrap/vagrant-onap/tests/test_robot
@@ -9,36 +9,36 @@ covered_functions=(
# test_clone_robot_repos() - Verify that Robot repositories are cloned properly
function test_clone_robot_repos {
- clone_repos "testsuite"
+ clone_repos "robot" "testsuite"
- asserts_file_exist $testsuite_src_folder/LICENSE.TXT
- asserts_file_exist $testsuite_src_folder/heatbridge/pom.xml
- asserts_file_exist $testsuite_src_folder/properties/LICENSE.TXT
- asserts_file_exist $testsuite_src_folder/python-testing-utils/LICENSE.TXT
+ asserts_file_exist $robot_src_folder/LICENSE.TXT
+ asserts_file_exist $robot_src_folder/heatbridge/pom.xml
+ asserts_file_exist $robot_src_folder/properties/LICENSE.TXT
+ asserts_file_exist $robot_src_folder/python-testing-utils/LICENSE.TXT
}
# test_compile_robot_repos() - Verify that Robot source code can be compiled properly
function test_compile_robot_repos {
- clone_repos "testsuite"
- compile_repos "testsuite"
+ clone_repos "robot" "testsuite"
+ compile_repos "robot"
#asserts_file_exist $testsuite_src_folder/heatbridge/target/maven-python/dist/heatbridge-0.3.0.dev0-py2-none-any.whl
}
# test_get_robot_images() - Verify that Robot Docker images are retrieved
-function test_get_mr_images {
+function test_get_robot_images {
get_robot_images
- asserts_image testsuite
+ asserts_image $nexus_docker_repo/openecomp/testsuite
}
# test_install_robot() - Verify the built and start of Robot services
-function test_install_message_router {
- clone_repos "robot"
+function test_install_robot {
+ clone_repos "robot" "testsuite"
get_robot_images
install_robot
- asserts_image_running testsuite
+ asserts_image_running $nexus_docker_repo/openecomp/testsuite
}
if [ "$1" != '*' ]; then