Rename tests

For legacy reasons (during the time from tensorflow v1 => v2),
we splits tests into two groups:
- tests/test_xxx.py which is used in v1 mode (and `tf.compat.v1.disable_eager_execution()` called)
- tests/test_xxx_eager.py which is used in v2 mode.

The reason was to prevent the mixture of v1 and v2 mode
as tensorflow may crash when two modes are mixed.

Over time it seems these two modes are not exactly follows.
For example, tests/test_azure.py is running in v2 mode
though they are groups in v1 during tests.

This PR changes the name so that:
- tests/test_xxx.py will always be run in v2 mode.
- tests/test_xxx_v1.py will always be run in v1 mode (and `tf.compat.v1.disable_eager_execution()` called)

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

Author: yongtang

.github/workflows/build.wheel.sh

@@ -7,10 +7,10 @@ run_test() {
   CPYTHON_VERSION=$($entry -c 'import sys; print(str(sys.version_info[0])+str(sys.version_info[1]))')
   (cd wheelhouse && $entry -m pip install tensorflow_io-*-cp${CPYTHON_VERSION}-*.whl)
   $entry -m pip install -q pytest pytest-benchmark boto3 fastavro avro-python3 scikit-image pandas pyarrow==3.0.0 google-cloud-pubsub==2.1.0 google-cloud-bigtable==1.6.0 google-cloud-bigquery-storage==1.1.0 google-cloud-bigquery==2.3.1 google-cloud-storage==1.32.0
-  (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_*.py" ! \( -iname "test_*_eager.py" \) \)))
-  (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_*_eager.py" ! \( -iname "test_bigquery_eager.py" \) \)))
+  (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_*_v1.py" \)))
+  (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_*.py" ! \( -iname "test_*_v1.py" -o -iname "test_bigquery.py" \) \)))
   # GRPC and test_bigquery_eager tests have to be executed separately because of https://github.com/grpc/grpc/issues/20034
-  (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_bigquery_eager.py" \)))
+  (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_bigquery.py" \)))
 }
 
 PYTHON_VERSION=python

.github/workflows/build.yml

@@ -434,14 +434,13 @@ jobs:
           python --version
           python -m pip install -U pytest-benchmark
           rm -rf tensorflow_io
-          (cd tests && python -m pytest -s -v test_lmdb_eager.py)
-          (python -m pytest -s -v test_image_eager.py -k "webp or ppm or bmp or bounding or exif or hdr or openexr or tiff or avif")
-          (python -m pytest -s -v test_serialization_eager.py)
-          (python -m pytest -s -v test_io_dataset_eager.py -k "numpy or hdf5 or audio or to_file")
-          (python -m pytest -s -v test_http_eager.py)
+          (cd tests && python -m pytest -s -v test_lmdb.py)
+          (python -m pytest -s -v test_image.py -k "webp or ppm or bmp or bounding or exif or hdr or openexr or tiff or avif")
+          (python -m pytest -s -v test_serialization.py)
+          (python -m pytest -s -v test_io_dataset.py -k "numpy or hdf5 or audio or to_file")
+          (python -m pytest -s -v test_http.py)
           python -m pip install google-cloud-bigquery-storage==0.7.0 google-cloud-bigquery==1.22.0 fastavro
-          (python -m pytest -s -v test_bigquery_eager.py)
-          (python -m pytest -s -v test_dicom_eager.py)
+          (python -m pytest -s -v test_bigquery.py)
           (python -m pytest -s -v test_dicom.py)
 
   release:

docs/development.md

@@ -88,7 +88,7 @@ bazel build -s --verbose_failures $BAZEL_OPTIMIZATION //tensorflow_io/...
 # `bazel-bin/tensorflow_io/core/python/ops/` and it is possible
 # to run tests with `pytest`, e.g.:
 sudo python3 -m pip install pytest
-TFIO_DATAPATH=bazel-bin python3 -m pytest -s -v tests/test_serialization_eager.py
+TFIO_DATAPATH=bazel-bin python3 -m pytest -s -v tests/test_serialization.py
 ```
 
 NOTE: When running pytest, `TFIO_DATAPATH=bazel-bin` has to be passed so that python can utilize the generated shared libraries after the build process.
@@ -147,7 +147,7 @@ bazel build -s --verbose_failures $BAZEL_OPTIMIZATION //tensorflow_io/...
 # `bazel-bin/tensorflow_io/core/python/ops/` and it is possible
 # to run tests with `pytest`, e.g.:
 sudo python3 -m pip install pytest
-TFIO_DATAPATH=bazel-bin python3 -m pytest -s -v tests/test_serialization_eager.py
+TFIO_DATAPATH=bazel-bin python3 -m pytest -s -v tests/test_serialization.py
 ```
 
 ##### CentOS 8
@@ -207,7 +207,7 @@ scl enable rh-python36 devtoolset-9 \
 
 TFIO_DATAPATH=bazel-bin \
   scl enable rh-python36 devtoolset-9 \
-    'python3 -m pytest -s -v tests/test_serialization_eager.py'
+    'python3 -m pytest -s -v tests/test_serialization.py'
 ```
 
 #### Python Wheels
@@ -295,7 +295,7 @@ use:
 $ bash -x -e tests/test_kafka/kafka_test.sh
 
 # Run the tests
-$ TFIO_DATAPATH=bazel-bin pytest -s -vv tests/test_kafka_eager.py
+$ TFIO_DATAPATH=bazel-bin pytest -s -vv tests/test_kafka.py
 ```
 
 Testing `Datasets` associated with tools such as `Elasticsearch` or `MongoDB`
@@ -307,7 +307,7 @@ require docker to be available on the system. In such scenarios, use:
 $ bash tests/test_elasticsearch/elasticsearch_test.sh start
 
 # Run the tests
-$ TFIO_DATAPATH=bazel-bin pytest -s -vv tests/test_elasticsearch_eager.py
+$ TFIO_DATAPATH=bazel-bin pytest -s -vv tests/test_elasticsearch.py
 
 # Stop and remove the container
 $ bash tests/test_elasticsearch/elasticsearch_test.sh stop
@@ -319,7 +319,7 @@ For example, to run tests related to `parquet` dataset's, use:
 
 ```sh
 # Just run the test
-$ TFIO_DATAPATH=bazel-bin pytest -s -vv tests/test_parquet_eager.py
+$ TFIO_DATAPATH=bazel-bin pytest -s -vv tests/test_parquet.py
 ```