#71 Allow Environment vars to substitute/override config vars - fix t…

…ests for Docker build
geopython · Apr 3, 2018 · 1076388 · 1076388
1 parent 37be0de
commit 1076388
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,30 +1,32 @@
 FROM debian:stretch-slim
 
-LABEL maintainer "Just van den Broecke <justb4@gmail.com>"
+LABEL maintainer="Just van den Broecke <justb4@gmail.com>"
 
+#
 # ARGS
-
+#
 ARG TIMEZONE="Europe/Amsterdam"
-ENV TZ=${TIMEZONE}
-
 ARG LOCALE="en_US.UTF-8"
 
 # ARG ADD_PYTHON_DEB_PACKAGES="python-scipy python-seaborn python-matplotlib"
 ARG ADD_PYTHON_DEB_PACKAGES=""
 # ARG ADD_PYTHON_PIP_PACKAGES="scikit-learn==0.18"
 ARG ADD_PYTHON_PIP_PACKAGES=""
 
-# General ENV settings
-ENV LC_ALL="${LOCALE}"
-ENV LC_TYPE="${LOCALE}"
-ENV LANG="${LOCALE}"
-ENV LANGUAGE="${LOCALE}"
-ENV DEBIAN_FRONTEND="noninteractive"
-ENV BUILD_DEPS="tzdata locales"
-ENV PYTHON_CORE_PACKAGES="cython python-requests python-tz python-numpy python-pandas python-setuptools python-pip python-lxml python-gdal python-psycopg2 python-jinja2 gdal-bin"
-ENV PYTHON_TEST_PACKAGES="python-nose2 python-mock"
-ENV PYTHON_EXTRA_DEB_PACKAGES="${ADD_PYTHON_DEB_PACKAGES}"
-ENV PYTHON_EXTRA_PIP_PACKAGES="${ADD_PYTHON_PIP_PACKAGES}"
+#
+# ENV settings
+#
+ENV TZ=${TIMEZONE} \
+   LC_ALL="${LOCALE}" \
+   LC_TYPE="${LOCALE}" \
+   LANG="${LOCALE}" \
+   LANGUAGE="${LOCALE}" \
+   DEBIAN_FRONTEND="noninteractive" \
+   BUILD_DEPS="tzdata locales" \
+   PYTHON_CORE_PACKAGES="cython python-requests python-tz python-numpy python-pandas python-setuptools python-pip python-lxml python-gdal python-psycopg2 python-jinja2 gdal-bin" \
+   PYTHON_TEST_PACKAGES="python-nose2 python-mock" \
+   PYTHON_EXTRA_DEB_PACKAGES="${ADD_PYTHON_DEB_PACKAGES}"  \
+   PYTHON_EXTRA_PIP_PACKAGES="${ADD_PYTHON_PIP_PACKAGES}"
 
 # Add Source Code
 ADD . /stetl
@@ -46,7 +48,7 @@ RUN \
 	# Locale
 	&& echo "LANG=${LANG}" >/etc/default/locale  \
 	&& echo "${LANG} UTF-8" > /etc/locale.gen \
-    && locale-gen\
+    && locale-gen \
     && dpkg-reconfigure locales \
     && /usr/sbin/update-locale LANG=${LANG} \
 

diff --git a/tests/outputs/configs/ogr2ogrexecoutput.cfg b/tests/outputs/configs/ogr2ogrexecoutput.cfg
@@ -48,7 +48,7 @@ class = outputs.execoutput.Ogr2OgrExecOutput
 dest_format = PostgreSQL
 dest_data_source = "PG:dbname=dummydb host=dummyhost port=dummyport user=dummyuser password=dummypassword active_schema=dummyschema"
 # miscellaneous ogr2ogr options
-options = -append -gt 65536 {multi_opts} --config PG_USE_COPY NO
+options = -append -gt 65536 -fieldTypeToString StringList --config PG_USE_COPY NO
 
 [output_ogr2ogr_gfs]
 class = outputs.execoutput.Ogr2OgrExecOutput

diff --git a/tests/outputs/configs/postgresdboutput.cfg b/tests/outputs/configs/postgresdboutput.cfg
@@ -9,9 +9,9 @@ file_path = tests/data/dummy.sql
 
 [output_postgres]
 class = outputs.dboutput.PostgresDbOutput
-database = {database}
-host = {host}
-port = {port}
-user = {user}
-password = {password}
-schema = {schema}
+database = database
+host = host
+port = port
+user = user
+password = password
+schema = schema
diff --git a/tests/outputs/test_ogr2ogr_exec_output.py b/tests/outputs/test_ogr2ogr_exec_output.py
@@ -118,7 +118,7 @@ def test_execute_options(self, mock_call):
         # Check command line
         args, kwargs = mock_call.call_args
         list = self.parse_command(args[0])
-        self.assertEqual(len(list), 12)
+        self.assertEqual(len(list), 13)
 
         # Check spatial extent
         self.assertTrue('-append' in list)