Merge pull request #19 from twangboy/merge-forward-fixes

Fixed test failures for Colton
saltstack · Jun 18, 2015 · 5b7a65d · 5b7a65d
2 parents b949856 + 98e7e90
commit 5b7a65d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/tests/unit/modules/win_servermanager_test.py b/tests/unit/modules/win_servermanager_test.py
@@ -63,7 +63,9 @@ def test_install(self):
         Test if it install a feature.
         '''
         with patch.dict(win_servermanager.__salt__, {'cmd.run': self._m_run()}):
-            self.assertDictEqual(win_servermanager.install('Telnet-Client'), {})
+            self.assertDictEqual(win_servermanager.install('Telnet-Client'), {
+                'message': ''
+            })
 
     # 'remove' function tests: 1
 
@@ -72,7 +74,9 @@ def test_remove(self):
         Test if it remove an installed feature.
         '''
         with patch.dict(win_servermanager.__salt__, {'cmd.run': self._m_run()}):
-            self.assertDictEqual(win_servermanager.remove('Telnet-Client'), {})
+            self.assertDictEqual(win_servermanager.remove('Telnet-Client'), {
+                'message': ''
+            })
 
 
 if __name__ == '__main__':

diff --git a/tests/unit/states/win_servermanager_test.py b/tests/unit/states/win_servermanager_test.py
@@ -56,7 +56,7 @@ def test_installed(self):
 
                 with patch.dict(win_servermanager.__opts__, {"test": False}):
                     ret.update({'changes': {'feature': {'Success': 'True'}},
-                                'result': True})
+                                'result': True, 'comment': 'Installed salt'})
                     self.assertDictEqual(win_servermanager.installed('salt'),
                                          ret)