Add elasticdl_client test execution in build_and_test.sh (#2124)

* Add elasticdl_client test in build_and_test.sh

* Install the dependency for elasticdl_client and elasticdl_preprocessing in the Dockerfile of the elasticdl:dev image

* Fix unit test failure.

Author: brightcoder01

elasticdl/docker/Dockerfile

@@ -9,6 +9,21 @@ RUN apt-get -qq update && \
                        shellcheck libeigen3-dev clang-format > /dev/null && \
     python -m pip install --quiet --upgrade pip
 
+COPY elasticdl_client/requirements.txt /requirements.txt
+RUN python -m pip install --quiet -r /requirements.txt \
+        --extra-index-url=$EXTRA_PYPI_INDEX \
+        && rm /requirements.txt
+
+COPY elasticdl_preprocessing/requirements.txt /requirements.txt
+RUN python -m pip install --quiet -r /requirements.txt \
+        --extra-index-url=$EXTRA_PYPI_INDEX \
+        && rm /requirements.txt
+
+COPY elasticdl_preprocessing/requirements-dev.txt /requirements-dev.txt
+RUN python -m pip install --quiet -r /requirements-dev.txt \
+        --extra-index-url=$EXTRA_PYPI_INDEX \
+    && rm /requirements-dev.txt
+
 COPY elasticdl/requirements.txt /requirements.txt
 RUN python -m pip install --quiet -r /requirements.txt \
         --extra-index-url=$EXTRA_PYPI_INDEX \

elasticdl_client/common/args.py

@@ -15,12 +15,14 @@
 
 from elasticdl_client.common.constants import DistributionStrategy
 
+DEFAULT_BASE_IMAGE = "python:3.6"
+
 
 def add_zoo_init_params(parser):
     parser.add_argument(
         "--base_image",
         type=str,
-        default="python:3.6",
+        default=DEFAULT_BASE_IMAGE,
         help="Base Docker image.",
     )
     parser.add_argument(

elasticdl_client/tests/arg_parser_test.py

@@ -13,6 +13,7 @@
 
 import unittest
 
+from elasticdl_client.common.args import DEFAULT_BASE_IMAGE
 from elasticdl_client.main import build_argument_parser
 
 
@@ -23,7 +24,7 @@ def setUp(self):
     def test_parse_zoo_init(self):
         args = ["zoo", "init"]
         args = self._parser.parse_args(args)
-        self.assertEqual(args.base_image, "python:latest")
+        self.assertEqual(args.base_image, DEFAULT_BASE_IMAGE)
         args.func(args)
 
         args = ["zoo", "init", "--base_image=elasticdl:base"]

scripts/build_and_test.sh

@@ -22,7 +22,11 @@ sh scripts/build.sh
     go test -v -cover ./...
 )
 
-pytest elasticdl/python/tests elasticdl_preprocessing/tests \
-    --cov=elasticdl/python --cov-report=xml
+# Run Python unittests
+pytest elasticdl/python/tests \
+    elasticdl_preprocessing/tests \
+    elasticdl_client/tests \
+    --cov=elasticdl/python \
+    --cov-report=xml
 mkdir -p ./build
 mv coverage.xml ./build