From 88cabfc702ef31ef29498cfa751296385e04cbad Mon Sep 17 00:00:00 2001 From: Bastian Eicher Date: Thu, 1 Dec 2011 19:54:09 +0100 Subject: [PATCH] Fixed handling of and bindings --- tests/Source.xml | 1 + tests/testmodel.py | 2 +- tests/testselections.py | 3 ++- zeroinstall/injector/model.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/Source.xml b/tests/Source.xml index 3ade45b..c7527ad 100644 --- a/tests/Source.xml +++ b/tests/Source.xml @@ -17,5 +17,6 @@ + diff --git a/tests/testmodel.py b/tests/testmodel.py index 5f2e049..aecacfd 100755 --- a/tests/testmodel.py +++ b/tests/testmodel.py @@ -220,7 +220,7 @@ class TestModel(BaseTest): self.assertEqual(expected, str(ol)) doc = minidom.parseString('') - new_xml = str(ol._toxml(doc).toxml()) + new_xml = str(ol._toxml(doc, None).toxml()) new_e = qdom.parse(BytesIO(new_xml)) new_ol = model.process_binding(new_e) self.assertEqual(expected, str(new_ol)) diff --git a/tests/testselections.py b/tests/testselections.py index a9b4b44..79b242d 100755 --- a/tests/testselections.py +++ b/tests/testselections.py @@ -48,8 +48,9 @@ class TestSelections(BaseTest): self.assertEqual(0, len(sels[0].bindings)) self.assertEqual(0, len(sels[0].dependencies)) - self.assertEqual(1, len(sels[1].bindings)) + self.assertEqual(2, len(sels[1].bindings)) self.assertEqual('.', sels[1].bindings[0].insert) + self.assertEqual('/', sels[1].bindings[1].mount_point) self.assertEqual(1, len(sels[1].dependencies)) dep = sels[1].dependencies[0] diff --git a/zeroinstall/injector/model.py b/zeroinstall/injector/model.py index 1ff7189..a08d9c1 100644 --- a/zeroinstall/injector/model.py +++ b/zeroinstall/injector/model.py @@ -363,7 +363,7 @@ class OverlayBinding(Binding): __repr__ = __str__ - def _toxml(self, doc): + def _toxml(self, doc, prefixes): """Create a DOM element for this binding. @param doc: document to use to create the element @return: the new element -- 2.11.4.GIT