summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-07-14 09:15:56 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-07-14 09:15:56 -0500
commit843634dbfdd330a91daaefdecc9804c585be3dca (patch)
tree2f39f6302a3c9b10a7bafd1e13de4b354212832e /testsuite
parent9b0f6d3ba70d799792252fec441346ebea02bacb (diff)
downloadbcfg2-843634dbfdd330a91daaefdecc9804c585be3dca.tar.gz
bcfg2-843634dbfdd330a91daaefdecc9804c585be3dca.tar.bz2
bcfg2-843634dbfdd330a91daaefdecc9804c585be3dca.zip
testsuite: Fix Metadata test failures
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py6
1 files changed, 4 insertions, 2 deletions
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):