1 files changed, 9 insertions, 53 deletions
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py
index c38e86aeb..3159b69df 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py
@@ -14,70 +14,26 @@ 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 Testbase import TestPOSIXLinkTool
 from common import *
 
-class TestPOSIXHardlink(TestPOSIXTool):
+
+class TestPOSIXHardlink(TestPOSIXLinkTool):
     test_obj = POSIXHardlink
 
     @patch("os.path.samefile")
-    @patch("Bcfg2.Client.Tools.POSIX.base.POSIXTool.verify")
-    def test_verify(self, mock_verify, mock_samefile):
+    def test__verify(self, mock_samefile):
         entry = lxml.etree.Element("Path", name="/test", type="hardlink",
                                    to="/dest")
         ptool = self.get_obj()
-
-        mock_samefile.return_value = True
-        mock_verify.return_value = False
-        self.assertFalse(ptool.verify(entry, []))
-        mock_samefile.assert_called_with(entry.get("name"),
-                                         entry.get("to"))
-        mock_verify.assert_called_with(ptool, entry, [])
-
-        mock_samefile.reset_mock()
-        mock_verify.reset_mock()
-        mock_verify.return_value = True
-        self.assertTrue(ptool.verify(entry, []))
-        mock_samefile.assert_called_with(entry.get("name"),
-                                         entry.get("to"))
-        mock_verify.assert_called_with(ptool, entry, [])
-
-        mock_samefile.reset_mock()
-        mock_verify.reset_mock()
-        mock_samefile.return_value = False
-        self.assertFalse(ptool.verify(entry, []))
-        mock_samefile.assert_called_with(entry.get("name"),
-                                         entry.get("to"))
-        mock_verify.assert_called_with(ptool, entry, [])
-        
-        mock_samefile.reset_mock()
-        mock_verify.reset_mock()
-        mock_samefile.side_effect = OSError
-        self.assertFalse(ptool.verify(entry, []))
-        mock_samefile.assert_called_with(entry.get("name"),
-                                         entry.get("to"))
+        self.assertEqual(ptool._verify(entry), mock_samefile.return_value)
+        self.assertItemsEqual(mock_samefile.call_args[0],
+                              [entry.get("name"), entry.get("to")])
 
     @patch("os.link")
-    @patch("Bcfg2.Client.Tools.POSIX.base.POSIXTool.install")
-    @patch("Bcfg2.Client.Tools.POSIX.Hardlink.%s._exists" % test_obj.__name__)
-    def test_install(self, mock_exists, mock_install, mock_link):
+    def test__link(self, mock_link):
         entry = lxml.etree.Element("Path", name="/test", type="hardlink",
                                    to="/dest")
         ptool = self.get_obj()
-
-        mock_exists.return_value = False
-        mock_install.return_value = True
-        self.assertTrue(ptool.install(entry))
-        mock_exists.assert_called_with(entry, remove=True)
-        mock_link.assert_called_with(entry.get("to"), entry.get("name"))
-        mock_install.assert_called_with(ptool, entry)
-
-        mock_link.reset_mock()
-        mock_exists.reset_mock()
-        mock_install.reset_mock()
-        mock_link.side_effect = OSError
-        self.assertFalse(ptool.install(entry))
-        mock_exists.assert_called_with(entry, remove=True)
+        self.assertEqual(ptool._link(entry), mock_link.return_value)
         mock_link.assert_called_with(entry.get("to"), entry.get("name"))
-        mock_install.assert_called_with(ptool, entry)