Merge branch 'master' into 1.4.x

Conflicts:
	doc/appendix/contributors.txt
	schemas/bundle.xsd
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Server/Encryption.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
	tools/bcfg2-profile-templates.py

1 files changed, 28 insertions, 28 deletions

diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
index 9f396b0b6..2f5eeb166 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
@@ -14,10 +14,10 @@ while path != "/":
     if os.path.basename(path) == "testsuite":
         break
     path = os.path.dirname(path)
-from Test__init import get_posix_object
 from Testbase import TestPOSIXTool
 from common import *
 
+
 class TestPOSIXDevice(TestPOSIXTool):
     test_obj = POSIXDevice
 
@@ -37,48 +37,48 @@ class TestPOSIXDevice(TestPOSIXTool):
             entry.set("major", "0")
             entry.set("minor", "0")
             self.assertTrue(ptool.fully_specified(entry))
-    
+
     @patch("os.major")
     @patch("os.minor")
-    @patch("Bcfg2.Client.Tools.POSIX.base.POSIXTool._exists")
     @patch("Bcfg2.Client.Tools.POSIX.base.POSIXTool.verify")
-    def test_verify(self, mock_verify, mock_exists, mock_minor, mock_major):
+    def test_verify(self, mock_verify, mock_minor, mock_major):
         entry = lxml.etree.Element("Path", name="/test", type="device",
                                    mode='0644', owner='root', group='root',
                                    dev_type="block", major="0", minor="10")
         ptool = self.get_obj()
+        ptool._exists = Mock()
 
         def reset():
-            mock_exists.reset_mock()
+            ptool._exists.reset_mock()
             mock_verify.reset_mock()
             mock_minor.reset_mock()
             mock_major.reset_mock()
 
-        mock_exists.return_value = False
+        ptool._exists.return_value = False
         self.assertFalse(ptool.verify(entry, []))
-        mock_exists.assert_called_with(entry)
+        ptool._exists.assert_called_with(entry)
 
         reset()
-        mock_exists.return_value = MagicMock()
+        ptool._exists.return_value = MagicMock()
         mock_major.return_value = 0
         mock_minor.return_value = 10
         mock_verify.return_value = True
         self.assertTrue(ptool.verify(entry, []))
         mock_verify.assert_called_with(ptool, entry, [])
-        mock_exists.assert_called_with(entry)
-        mock_major.assert_called_with(mock_exists.return_value.st_rdev)
-        mock_minor.assert_called_with(mock_exists.return_value.st_rdev)
+        ptool._exists.assert_called_with(entry)
+        mock_major.assert_called_with(ptool._exists.return_value.st_rdev)
+        mock_minor.assert_called_with(ptool._exists.return_value.st_rdev)
 
         reset()
-        mock_exists.return_value = MagicMock()
+        ptool._exists.return_value = MagicMock()
         mock_major.return_value = 0
         mock_minor.return_value = 10
         mock_verify.return_value = False
         self.assertFalse(ptool.verify(entry, []))
         mock_verify.assert_called_with(ptool, entry, [])
-        mock_exists.assert_called_with(entry)
-        mock_major.assert_called_with(mock_exists.return_value.st_rdev)
-        mock_minor.assert_called_with(mock_exists.return_value.st_rdev)
+        ptool._exists.assert_called_with(entry)
+        mock_major.assert_called_with(ptool._exists.return_value.st_rdev)
+        mock_minor.assert_called_with(ptool._exists.return_value.st_rdev)
 
         reset()
         mock_verify.return_value = True
@@ -86,26 +86,26 @@ class TestPOSIXDevice(TestPOSIXTool):
                                    mode='0644', owner='root', group='root',
                                    dev_type="fifo")
         self.assertTrue(ptool.verify(entry, []))
-        mock_exists.assert_called_with(entry)
+        ptool._exists.assert_called_with(entry)
         mock_verify.assert_called_with(ptool, entry, [])
         self.assertFalse(mock_major.called)
         self.assertFalse(mock_minor.called)
-    
+
     @patch("os.makedev")
     @patch("os.mknod")
-    @patch("Bcfg2.Client.Tools.POSIX.Device.%s._exists" % test_obj.__name__)
     @patch("Bcfg2.Client.Tools.POSIX.base.POSIXTool.install")
-    def test_install(self, mock_install, mock_exists, mock_mknod, mock_makedev):
+    def test_install(self, mock_install, mock_mknod, mock_makedev):
         entry = lxml.etree.Element("Path", name="/test", type="device",
                                    mode='0644', owner='root', group='root',
                                    dev_type="block", major="0", minor="10")
         ptool = self.get_obj()
+        ptool._exists = Mock()
 
-        mock_exists.return_value = False
+        ptool._exists.return_value = False
         mock_makedev.return_value = Mock()
         mock_install.return_value = True
         self.assertTrue(ptool.install(entry))
-        mock_exists.assert_called_with(entry, remove=True)
+        ptool._exists.assert_called_with(entry, remove=True)
         mock_makedev.assert_called_with(0, 10)
         mock_mknod.assert_called_with(entry.get("name"),               # 0o644
                                       device_map[entry.get("dev_type")] | 420,
@@ -114,29 +114,29 @@ class TestPOSIXDevice(TestPOSIXTool):
 
         mock_makedev.reset_mock()
         mock_mknod.reset_mock()
-        mock_exists.reset_mock()
+        ptool._exists.reset_mock()
         mock_install.reset_mock()
         mock_makedev.side_effect = OSError
         self.assertFalse(ptool.install(entry))
 
         mock_makedev.reset_mock()
         mock_mknod.reset_mock()
-        mock_exists.reset_mock()
+        ptool._exists.reset_mock()
         mock_install.reset_mock()
         mock_mknod.side_effect = OSError
         self.assertFalse(ptool.install(entry))
-        
+
         mock_makedev.reset_mock()
         mock_mknod.reset_mock()
-        mock_exists.reset_mock()
-        mock_install.reset_mock()        
+        ptool._exists.reset_mock()
+        mock_install.reset_mock()
         mock_mknod.side_effect = None
         entry = lxml.etree.Element("Path", name="/test", type="device",
                                    mode='0644', owner='root', group='root',
                                    dev_type="fifo")
-        
+
         self.assertTrue(ptool.install(entry))
-        mock_exists.assert_called_with(entry, remove=True)
+        ptool._exists.assert_called_with(entry, remove=True)
         mock_mknod.assert_called_with(entry.get("name"),               # 0o644
                                       device_map[entry.get("dev_type")] | 420)
         mock_install.assert_called_with(ptool, entry)