From d55fc85feadf51e753c06b34f7cc200305915a54 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 8 Mar 2016 16:55:05 -0800
Subject: [PATCH] Added default env file test.

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 tests/fixtures/default-env-file/.env               |  4 ++++
 tests/fixtures/default-env-file/docker-compose.yml |  6 ++++++
 tests/unit/config/config_test.py                   | 13 +++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 tests/fixtures/default-env-file/.env
 create mode 100644 tests/fixtures/default-env-file/docker-compose.yml

diff --git a/tests/fixtures/default-env-file/.env b/tests/fixtures/default-env-file/.env
new file mode 100644
index 000000000..996c886cb
--- /dev/null
+++ b/tests/fixtures/default-env-file/.env
@@ -0,0 +1,4 @@
+IMAGE=alpine:latest
+COMMAND=true
+PORT1=5643
+PORT2=9999
\ No newline at end of file
diff --git a/tests/fixtures/default-env-file/docker-compose.yml b/tests/fixtures/default-env-file/docker-compose.yml
new file mode 100644
index 000000000..aa8e4409e
--- /dev/null
+++ b/tests/fixtures/default-env-file/docker-compose.yml
@@ -0,0 +1,6 @@
+web:
+    image: ${IMAGE}
+    command: ${COMMAND}
+    ports:
+        - $PORT1
+        - $PORT2
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index daf724a88..913cbed9c 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1582,6 +1582,19 @@ class PortsTest(unittest.TestCase):
 
 
 class InterpolationTest(unittest.TestCase):
+    @mock.patch.dict(os.environ)
+    def test_config_file_with_environment_file(self):
+        service_dicts = config.load(
+            config.find('tests/fixtures/default-env-file', None)
+        ).services
+
+        self.assertEqual(service_dicts[0], {
+            'name': 'web',
+            'image': 'alpine:latest',
+            'ports': ['5643', '9999'],
+            'command': 'true'
+        })
+
     @mock.patch.dict(os.environ)
     def test_config_file_with_environment_variable(self):
         os.environ.update(