Update tests

Added __context__ to test cases to reflect usage of __context__, and also added file.source_list to mocked funcs for archive.extracted unit test.
saltstack · Apr 20, 2016 · cdcd960 · cdcd960
1 parent 50611cf
commit cdcd960
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tests/integration/modules/file.py b/tests/integration/modules/file.py
@@ -173,6 +173,7 @@ def test_source_list_for_list_returns_existing_file(self):
                 return_value=['http/httpd.conf.fallback']),
             'cp.list_master_dirs': MagicMock(return_value=[]),
         }
+        filemod.__context__ = {}
 
         ret = filemod.source_list(['salt://http/httpd.conf',
                                    'salt://http/httpd.conf.fallback'],
@@ -188,6 +189,8 @@ def list_master(env):
             'cp.list_master': MagicMock(side_effect=list_master),
             'cp.list_master_dirs': MagicMock(return_value=[]),
         }
+        filemod.__context__ = {}
+
         ret = filemod.source_list(['salt://http/httpd.conf?saltenv=dev',
                                    'salt://http/httpd.conf.fallback'],
                                   'filehash', 'base')
@@ -199,6 +202,8 @@ def test_source_list_for_list_returns_file_from_dict(self):
             'cp.list_master': MagicMock(return_value=['http/httpd.conf']),
             'cp.list_master_dirs': MagicMock(return_value=[]),
         }
+        filemod.__context__ = {}
+
         ret = filemod.source_list(
             [{'salt://http/httpd.conf': ''}], 'filehash', 'base')
         self.assertItemsEqual(ret, ['salt://http/httpd.conf', 'filehash'])
@@ -209,8 +214,10 @@ def test_source_list_for_list_returns_file_from_dict_via_http(self, remove):
         filemod.__salt__ = {
             'cp.list_master': MagicMock(return_value=[]),
             'cp.list_master_dirs': MagicMock(return_value=[]),
-            'cp.get_url': MagicMock(return_value='/tmp/http.conf'),
+            'cp.cache_file': MagicMock(return_value='/tmp/http.conf'),
         }
+        filemod.__context__ = {}
+
         ret = filemod.source_list(
             [{'http://t.est.com/http/httpd.conf': 'filehash'}], '', 'base')
         self.assertItemsEqual(ret, ['http://t.est.com/http/httpd.conf',

diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
@@ -59,14 +59,16 @@ def test_extracted_tar(self):
         mock_false = MagicMock(return_value=False)
         ret = {'stdout': ['saltines', 'cheese'], 'stderr': 'biscuits', 'retcode': '31337', 'pid': '1337'}
         mock_run = MagicMock(return_value=ret)
+        mock_source_list = MagicMock(return_value=source)
 
         with patch('os.path.exists', mock_true):
             with patch.dict(archive.__opts__, {'test': False,
                                                'cachedir': tmp_dir}):
                 with patch.dict(archive.__salt__, {'file.directory_exists': mock_false,
                                                    'file.file_exists': mock_false,
                                                    'file.makedirs': mock_true,
-                                                   'cmd.run_all': mock_run}):
+                                                   'cmd.run_all': mock_run,
+                                                   'file.source_list': mock_source_list}):
                     filename = os.path.join(
                         tmp_dir,
                         'files/test/_tmp_test_archive_.tar'