From cf43e6edf7c734c3a98306bf9b4a01eb7f516005 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 2 Feb 2017 14:22:50 -0800
Subject: [PATCH] Don't re-parse healthcheck values coming from extended
 services

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py                 | 10 ++++++++--
 tests/fixtures/extends/healthcheck-1.yml |  9 +++++++++
 tests/fixtures/extends/healthcheck-2.yml |  6 ++++++
 tests/unit/config/config_test.py         | 13 +++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 tests/fixtures/extends/healthcheck-1.yml
 create mode 100644 tests/fixtures/extends/healthcheck-2.yml

diff --git a/compose/config/config.py b/compose/config/config.py
index 0e8b52e79..63ee25ab2 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -716,9 +716,15 @@ def process_healthcheck(service_dict, service_name):
         hc['test'] = raw['test']
 
     if 'interval' in raw:
-        hc['interval'] = parse_nanoseconds_int(raw['interval'])
+        if not isinstance(raw['interval'], six.integer_types):
+            hc['interval'] = parse_nanoseconds_int(raw['interval'])
+        else:  # Conversion has been done previously
+            hc['interval'] = raw['interval']
     if 'timeout' in raw:
-        hc['timeout'] = parse_nanoseconds_int(raw['timeout'])
+        if not isinstance(raw['timeout'], six.integer_types):
+            hc['timeout'] = parse_nanoseconds_int(raw['timeout'])
+        else:  # Conversion has been done previously
+            hc['timeout'] = raw['timeout']
     if 'retries' in raw:
         hc['retries'] = raw['retries']
 
diff --git a/tests/fixtures/extends/healthcheck-1.yml b/tests/fixtures/extends/healthcheck-1.yml
new file mode 100644
index 000000000..4c311e62c
--- /dev/null
+++ b/tests/fixtures/extends/healthcheck-1.yml
@@ -0,0 +1,9 @@
+version: '2.1'
+services:
+  demo:
+    image: foobar:latest
+    healthcheck:
+      test: ["CMD", "/health.sh"]
+      interval: 10s
+      timeout: 5s
+      retries: 36
diff --git a/tests/fixtures/extends/healthcheck-2.yml b/tests/fixtures/extends/healthcheck-2.yml
new file mode 100644
index 000000000..11bc9f09d
--- /dev/null
+++ b/tests/fixtures/extends/healthcheck-2.yml
@@ -0,0 +1,6 @@
+version: '2.1'
+services:
+  demo:
+    extends:
+      file: healthcheck-1.yml
+      service: demo
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d7947a4e8..a3be6df8a 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -3098,6 +3098,19 @@ class ExtendsTest(unittest.TestCase):
             'other': {'condition': 'service_started'}
         }
 
+    def test_extends_with_healthcheck(self):
+        service_dicts = load_from_filename('tests/fixtures/extends/healthcheck-2.yml')
+        assert service_sort(service_dicts) == [{
+            'name': 'demo',
+            'image': 'foobar:latest',
+            'healthcheck': {
+                'test': ['CMD', '/health.sh'],
+                'interval': 10000000000,
+                'timeout': 5000000000,
+                'retries': 36,
+            }
+        }]
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):