From 843634dbfdd330a91daaefdecc9804c585be3dca Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 14 Jul 2012 09:15:56 -0500 Subject: testsuite: Fix Metadata test failures Signed-off-by: Sol Jerome --- testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'testsuite') diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py index 455731d00..124474e58 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -5,6 +5,7 @@ import socket import unittest import lxml.etree from mock import Mock, patch +import Bcfg2.Server import Bcfg2.Server.Plugin from Bcfg2.Server.Plugins.Metadata import * @@ -240,7 +241,7 @@ class TestXMLMetadataConfig(unittest.TestCase): class TestClientMetadata(unittest.TestCase): def test_inGroup(self): cm = ClientMetadata("client1", "group1", ["group1", "group2"], - ["bundle1"], [], [], [], None, None, None) + ["bundle1"], [], [], [], None, None, None, None) self.assertTrue(cm.inGroup("group1")) self.assertFalse(cm.inGroup("group3")) @@ -298,7 +299,8 @@ class TestMetadata(unittest.TestCase): mock_parse.return_value = groups_test_tree groups = metadata.get_groups() mock_parse.assert_called_with(os.path.join(datastore, "Metadata", - "groups.xml")) + "groups.xml"), + parser=Bcfg2.Server.XMLParser) self.assertIsInstance(groups, lxml.etree._Element) def test_search_xdata_name(self): -- cgit v1.2.3-1-g7c22