Fix additional issues.

Signed-off-by: Yong Tang <[email protected]>

Author: yongtang

.kokorun/io_cpu.sh

@@ -67,32 +67,53 @@ if [[ $PYTHON_VERSION == "2" ]]; then
 
     sudo rm -rf dist wheelhouse
 
+    ## TF 2.0
+    docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:14.04 bash -x -e .travis/python.release.sh "tensorflow==2.0.0beta" --preview ${KOKORO_BUILD_NUMBER} python
+
     ## Stop then restart prometheus
     bash -x -e tests/test_prometheus/prometheus_test.sh stop
     bash -x -e tests/test_prometheus/prometheus_test.sh start
 
-    ## TF 2.0
-    docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:14.04 bash -x -e .travis/python.release.sh "tensorflow==2.0.0beta" --preview ${KOKORO_BUILD_NUMBER} python
-
     docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:16.04 bash -x -e .travis/wheel.test.sh python
+
+    ## Stop then restart prometheus
+    bash -x -e tests/test_prometheus/prometheus_test.sh stop
+    bash -x -e tests/test_prometheus/prometheus_test.sh start
+
     docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:18.04 bash -x -e .travis/wheel.test.sh python
 else
     ## Python 2
     docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:14.04 bash -x -e .travis/python.release.sh "${TENSORFLOW_INSTALL}" python3.5 python3.6
 
-    docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:16.04 bash -x -e .travis/wheel.test.sh python3.5
-    docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:18.04 bash -x -e .travis/wheel.test.sh python3.6
 
-    sudo rm -rf dist wheelhouse
+    ## Stop then restart prometheus
+    bash -x -e tests/test_prometheus/prometheus_test.sh stop
+    bash -x -e tests/test_prometheus/prometheus_test.sh start
+
+    docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:16.04 bash -x -e .travis/wheel.test.sh python3.5
 
     ## Stop then restart prometheus
     bash -x -e tests/test_prometheus/prometheus_test.sh stop
     bash -x -e tests/test_prometheus/prometheus_test.sh start
 
+    docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:18.04 bash -x -e .travis/wheel.test.sh python3.6
+
+    sudo rm -rf dist wheelhouse
+
     ## TF 2.0
     docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:14.04 bash -x -e .travis/python.release.sh "tensorflow==2.0.0beta" --preview ${KOKORO_BUILD_NUMBER} python3.5 python3.6
 
+
+    ## Stop then restart prometheus
+    bash -x -e tests/test_prometheus/prometheus_test.sh stop
+    bash -x -e tests/test_prometheus/prometheus_test.sh start
+
     docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:16.04 bash -x -e .travis/wheel.test.sh python3.5
+
+    ## Stop then restart prometheus
+    bash -x -e tests/test_prometheus/prometheus_test.sh stop
+    bash -x -e tests/test_prometheus/prometheus_test.sh start
+
     docker run -i --rm -v $PWD:/v -w /v --net=host buildpack-deps:18.04 bash -x -e .travis/wheel.test.sh python3.6
 fi
 

tests/test_prometheus.py renamed to tests/test_prometheus_eager.py

@@ -24,7 +24,9 @@
 import pytest
 
 import tensorflow as tf
-import tensorflow_io.prometheus as prometheus_io
+if not (hasattr(tf, "version") and tf.version.VERSION.startswith("2.")):
+  tf.compat.v1.enable_eager_execution()
+import tensorflow_io.prometheus as prometheus_io # pylint: disable=wrong-import-position
 
 if sys.platform == "darwin":
   pytest.skip(
@@ -43,6 +45,7 @@ def test_prometheus_input():
       batch=2)
   i = 0
   for k, v in prometheus_dataset:
+    print("K, V: ", k.numpy(), v.numpy())
     if i == 4:
       # Last entry guaranteed 6.0
       assert v.numpy() == 6.0