File 0014-Fix-some-unittests.patch of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File 0014-Fix-some-unittests.patch of Package salt (Revision 6532bc5b9ceb6d6b6fef3c1d3ada6a69)

Currently displaying revision 6532bc5b9ceb6d6b6fef3c1d3ada6a69 , Show latest

From 290263310f89548b903de6a3e5de43ed0ef6479f Mon Sep 17 00:00:00 2001
From: Mihai Dinca <mdinca@suse.de>
Date: Tue, 23 Aug 2016 11:55:33 +0200
Subject: [PATCH 14/38] Fix some unittests

PR: https://github.com/saltstack/salt/pull/35693

Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

Fix unit/pyobjects_test.py::MapTests::test_map

Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
---
 tests/unit/modules/useradd_test.py |  6 ++----
 tests/unit/pyobjects_test.py       | 11 +++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/unit/modules/useradd_test.py b/tests/unit/modules/useradd_test.py
index 7e646b6..cc9e610 100644
--- a/tests/unit/modules/useradd_test.py
+++ b/tests/unit/modules/useradd_test.py
@@ -326,7 +326,7 @@ class UserAddTestCase(TestCase):
         '''
         Test the user information
         '''
-        self.assertEqual(useradd.info('salt'), {})
+        self.assertEqual(useradd.info('username-that-doesnt-exist'), {})
 
         mock = MagicMock(return_value=pwd.struct_passwd(('_TEST_GROUP',
                                                          '*',
@@ -336,9 +336,7 @@ class UserAddTestCase(TestCase):
                                                          '/var/virusmails',
                                                          '/usr/bin/false')))
         with patch.object(pwd, 'getpwnam', mock):
-            mock = MagicMock(return_value='Group Name')
-            with patch.object(useradd, 'list_groups', mock):
-                self.assertEqual(useradd.info('salt')['name'], '_TEST_GROUP')
+            self.assertEqual(useradd.info('username-that-doesnt-exist')['name'], '_TEST_GROUP')
 
     # 'list_groups' function tests: 1
 
diff --git a/tests/unit/pyobjects_test.py b/tests/unit/pyobjects_test.py
index f1c3e29..3eb4bd5 100644
--- a/tests/unit/pyobjects_test.py
+++ b/tests/unit/pyobjects_test.py
@@ -54,10 +54,18 @@ include('http')
 
 extend_template = '''#!pyobjects
 include('http')
+
+from salt.utils.pyobjects import StateFactory
+Service = StateFactory('service')
+
 Service.running(extend('apache'), watch=[{'file': '/etc/file'}])
 '''
 
 map_template = '''#!pyobjects
+from salt.utils.pyobjects import StateFactory
+Service = StateFactory('service')
+
+
 class Samba(Map):
     __merge__ = 'samba:lookup'
 
@@ -127,6 +135,9 @@ from salt://password.sls import password
 '''
 
 requisite_implicit_list_template = '''#!pyobjects
+from salt.utils.pyobjects import StateFactory
+Service = StateFactory('service')
+
 with Pkg.installed("pkg"):
     Service.running("service", watch=File("file"), require=Cmd("cmd"))
 '''
-- 
2.10.2

Places

File 0014-Fix-some-unittests.patch of Package salt (Revision 6532bc5b9ceb6d6b6fef3c1d3ada6a69)

Places