From fadd9bd43eb6aae76fa1142c657bcbc0839dd3b0 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas.delaby@lock8.me>
Date: Tue, 29 Sep 2015 15:53:29 +0200
Subject: [PATCH] Add test to check we don't call inspect_image on absent
 images.

---
 tests/unit/states/dockerng_test.py | 44 ++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/tests/unit/states/dockerng_test.py b/tests/unit/states/dockerng_test.py
index fbe905d20f..43fecb45d0 100644
--- a/tests/unit/states/dockerng_test.py
+++ b/tests/unit/states/dockerng_test.py
@@ -20,6 +20,7 @@ from salttesting.mock import (
 ensure_in_syspath('../../')
 
 # Import Salt Libs
+from salt.exceptions import CommandExecutionError
 from salt.modules import dockerng as dockerng_mod
 from salt.states import dockerng as dockerng_state
 
@@ -272,6 +273,49 @@ class DockerngTestCase(TestCase):
                               'name': 'image:latest',
                               })
 
+    def test_image_present_and_force(self):
+        '''
+        According following sls,
+
+        .. code-block:: yaml
+
+            image:latest:
+              dockerng.image_present:
+                - force: true
+
+        if ``image:latest`` is not downloaded and force is true
+        should pull a new image successfuly.
+        '''
+        dockerng_inspect_image = Mock(
+            side_effect=CommandExecutionError(
+                'Error 404: No such image/container: image:latest'))
+        dockerng_pull = Mock(
+            return_value={'Layers':
+                          {'Already_Pulled': ['abcdefghijk'],
+                           'Pulled': ['abcdefghijk']},
+                          'Status': "Image 'image:latest' was pulled",
+                          'Time_Elapsed': 1.1})
+        dockerng_list_tags = Mock(
+            side_effect=[[], ['image:latest']]
+        )
+        __salt__ = {'dockerng.list_tags': dockerng_list_tags,
+                    'dockerng.pull': dockerng_pull,
+                    'dockerng.inspect_image': dockerng_inspect_image,
+                    }
+        with patch.dict(dockerng_state.__dict__,
+                        {'__salt__': __salt__}):
+            ret = dockerng_state.image_present('image:latest', force=True)
+        self.assertEqual(ret,
+                         {'changes': {
+                             'Layers': {'Already_Pulled': ['abcdefghijk'],
+                                        'Pulled': ['abcdefghijk']},
+                             'Status': "Image 'image:latest' was pulled",
+                             'Time_Elapsed': 1.1},
+                             'result': True,
+                             'comment': "Image 'image:latest' was pulled",
+                             'name': 'image:latest',
+                         })
+
     def test_check_start_false(self):
         '''
         If start is False, then dockerng.running will not try