yaoliclshlmch closed pull request #2942: [do not review] test travis ci
URL: https://github.com/apache/incubator-heron/pull/2942
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/integration_test/src/python/topology_test_runner/main.py
b/integration_test/src/python/topology_test_runner/main.py
index ec948cc7be..a05d9741cb 100644
--- a/integration_test/src/python/topology_test_runner/main.py
+++ b/integration_test/src/python/topology_test_runner/main.py
@@ -101,6 +101,11 @@ def _parse_expected_results(self, expected_results):
"""
expected_nodes = dict()
expected_links = dict()
+
+ # for test
+ logging.info("expected result: ")
+ logging.info(expected_results)
+
for bolt in expected_results["topology"]["bolts"]:
name = bolt["comp"]["name"]
if name not in expected_links:
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index b32411cac6..01bdc2fd45 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -348,6 +348,7 @@ pkg_tar(
srcs = [
"//integration_test/src/python/http_server:http-server",
"//integration_test/src/python/test_runner:test-runner",
+
"//integration_test/src/python/topology_test_runner:topology-test-runner",
]
)
@@ -369,6 +370,15 @@ pkg_tar(
strip_prefix =
'/integration_test/src/java/org/apache/heron/integration_test/topology/'
)
+pkg_tar(
+ name = "heron-tests-data-topology-java",
+ package_dir = "data/java/topology_test",
+ srcs = [
+ "//integration_test/src/java:topology-test-data-files",
+ ],
+ strip_prefix =
'/integration_test/src/java/org/apache/heron/integration_topology_test/topology/'
+)
+
pkg_tar(
name = "heron-tests-data-python",
package_dir = "data/python",
@@ -384,6 +394,7 @@ pkg_tar(
srcs = [
"//integration_test/src/scala:scala-integration-tests",
"//integration_test/src/java:integration-tests",
+ "//integration_test/src/java:integration-topology-tests",
"//integration_test/src/python/integration_test/topology:heron_integ_topology",
],
)
@@ -396,6 +407,7 @@ pkg_tar(
":heron-tests-bin",
":heron-tests-data-scala",
":heron-tests-data-java",
+ ":heron-tests-data-topology-java",
":heron-tests-data-python",
":heron-tests-lib",
],
diff --git a/scripts/packages/tests_template_bin.sh
b/scripts/packages/tests_template_bin.sh
index 66567b36ce..b3604a215a 100755
--- a/scripts/packages/tests_template_bin.sh
+++ b/scripts/packages/tests_template_bin.sh
@@ -71,12 +71,18 @@ echo -n "Uncompressing."
if [ -L "${bin}/test-runner" ]; then
rm -f "${bin}/test-runner"
fi
+if [ -L "${bin}/topology-test-runner" ]; then
+ rm -f "${bin}/topology-test-runner"
+fi
if [ -L "${bin}/http-server" ]; then
rm -f "${bin}/http-server"
fi
if [ -d "${base}" -a -x "${base}/bin/test-runner" ]; then
rm -fr "${base}"
fi
+if [ -d "${base}" -a -x "${base}/bin/topology-test-runner" ]; then
+ rm -fr "${base}"
+fi
mkdir -p ${bin} ${base}
echo -n .
@@ -84,7 +90,7 @@ echo -n .
unzip -q -o "${BASH_SOURCE[0]}" -d "${base}"
untar ${base}/heron-tests.tar.gz ${base}
echo -n .
-chmod 0755 ${base}/bin/test-runner ${base}/bin/http-server
+chmod 0755 ${base}/bin/test-runner ${base}/bin/http-server
${base}/bin/topology-test-runner
echo -n .
chmod -R og-w "${base}"
chmod -R og+rX "${base}"
@@ -92,6 +98,7 @@ chmod -R u+rwX "${base}"
echo -n .
ln -s "${base}/bin/test-runner" "${bin}/test-runner"
+ln -s "${base}/bin/topology-test-runner" "${bin}/topology-test-runner"
ln -s "${base}/bin/http-server" "${bin}/http-server"
mv "${base}/lib/heron_integ_topology" "${base}/lib/heron_integ_topology.pex"
echo -n .
diff --git a/scripts/travis/test.sh b/scripts/travis/test.sh
index 2cece6059d..1c22fc1ce9 100755
--- a/scripts/travis/test.sh
+++ b/scripts/travis/test.sh
@@ -14,6 +14,7 @@ echo "Using $PLATFORM platform"
# integration test binaries have to be specified as absolute path
JAVA_INTEGRATION_TESTS_BIN="${HOME}/.herontests/lib/integration-tests.jar"
+JAVA_INTEGRATION_TOPOLOGY_TESTS_BIN="${HOME}/.herontests/lib/integration-topology-tests.jar"
PYTHON_INTEGRATION_TESTS_BIN="${HOME}/.herontests/lib/heron_integ_topology.pex"
SCALA_INTEGRATION_TESTS_BIN="${HOME}/.herontests/lib/scala-integration-tests.jar"
@@ -79,4 +80,15 @@ ${HOME}/bin/test-runner \
-cl local -rl heron-staging -ev devel
end_timer "$T"
+# run the java integration topology test
+T="heron integration_topology_test java"
+start_timer "$T"
+${HOME}/bin/topology-test-runner \
+ -hc heron -tb ${JAVA_INTEGRATION_TOPOLOGY_TESTS_BIN} \
+ -rh localhost -rp 8080\
+ -tp ${HOME}/.herontests/data/java/topology_test \
+ -cl local -rl heron-staging -ev devel
+end_timer "$T"
+
print_timer_summary
+
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
