1 files changed, 5 insertions, 25 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgAuthorizedKeysGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgAuthorizedKeysGenerator.py
index d655a20cd..e5cef8fa2 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgAuthorizedKeysGenerator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgAuthorizedKeysGenerator.py
@@ -23,6 +23,10 @@ class TestCfgAuthorizedKeysGenerator(TestCfgGenerator, TestStructFile):
     test_obj = CfgAuthorizedKeysGenerator
     should_monitor = False
 
+    def setUp(self):
+        TestCfgGenerator.setUp(self)
+        TestStructFile.setUp(self)
+
     def get_obj(self, name=None, core=None, fam=None):
         if name is None:
             name = self.path
@@ -40,33 +44,9 @@ class TestCfgAuthorizedKeysGenerator(TestCfgGenerator, TestStructFile):
         mock_HandleEvent.assert_called_with(akg, evt)
         mock_handle_event.assert_called_with(akg, evt)
 
-    def test_category(self):
-        akg = self.get_obj()
-        cfp = Mock()
-        cfp.has_section.return_value = False
-        cfp.has_option.return_value = False
-        Bcfg2.Server.Plugins.Cfg.CfgAuthorizedKeysGenerator.SETUP = Mock()
-        Bcfg2.Server.Plugins.Cfg.CfgAuthorizedKeysGenerator.SETUP.cfp = cfp
-
-        self.assertIsNone(akg.category)
-        cfp.has_section.assert_called_with("sshkeys")
-
-        cfp.reset_mock()
-        cfp.has_section.return_value = True
-        self.assertIsNone(akg.category)
-        cfp.has_section.assert_called_with("sshkeys")
-        cfp.has_option.assert_called_with("sshkeys", "category")
-
-        cfp.reset_mock()
-        cfp.has_option.return_value = True
-        self.assertEqual(akg.category, cfp.get.return_value)
-        cfp.has_section.assert_called_with("sshkeys")
-        cfp.has_option.assert_called_with("sshkeys", "category")
-        cfp.get.assert_called_with("sshkeys", "category")
-
     @patch("Bcfg2.Server.Plugins.Cfg.CfgAuthorizedKeysGenerator.ClientMetadata")
-    @patch("Bcfg2.Server.Plugins.Cfg.CfgAuthorizedKeysGenerator.CfgAuthorizedKeysGenerator.category", "category")
     def test_get_data(self, mock_ClientMetadata):
+        Bcfg2.Options.setup.sshkeys_category = "category"
         akg = self.get_obj()
         akg.XMLMatch = Mock()