From ca4a2ca813e4ab2112d8b6ea5651f3e50587fafb Mon Sep 17 00:00:00 2001 From: Edward d'Auvergne Date: Tue, 12 Nov 2019 14:23:12 +0100 Subject: [PATCH] Catalogs: Bug fixes allowing the unit tests to pass again. 3 of the tests have been broken since 70dfd6b8d478270f60445870fba6789b1cfd5683, the change to LXML. --- catalog/test_catalog.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/catalog/test_catalog.py b/catalog/test_catalog.py index 2e6f138..0e2fd79 100755 --- a/catalog/test_catalog.py +++ b/catalog/test_catalog.py @@ -4,7 +4,7 @@ import unittest import sgprops import os import catalog -import xml.etree.cElementTree as ET +import lxml.etree as ET catalog.quiet = True @@ -93,7 +93,7 @@ class UpdateCatalogTests(unittest.TestCase): catalog_node = ET.Element('PropertyList') catalog_root = ET.ElementTree(catalog_node) - pkgNode = catalog.make_aircraft_node('f16', pkg, variants, "http://foo.com/testOutput/") + pkgNode = catalog.make_aircraft_node('f16', pkg, variants, "http://foo.com/testOutput/", []) catalog_node.append(pkgNode) # write out so we can parse using sgprops @@ -172,7 +172,7 @@ class UpdateCatalogTests(unittest.TestCase): catalog_node = ET.Element('PropertyList') catalog_root = ET.ElementTree(catalog_node) - pkgNode = catalog.make_aircraft_node('dc3', pkg, variants, "http://foo.com/testOutput/") + pkgNode = catalog.make_aircraft_node('dc3', pkg, variants, "http://foo.com/testOutput/", []) catalog_node.append(pkgNode) if not os.path.isdir("testOutput"): @@ -210,7 +210,7 @@ class UpdateCatalogTests(unittest.TestCase): catalog_node = ET.Element('PropertyList') catalog_root = ET.ElementTree(catalog_node) - pkgNode = catalog.make_aircraft_node('c150', pkg, variants, "http://foo.com/testOutput/") + pkgNode = catalog.make_aircraft_node('c150', pkg, variants, "http://foo.com/testOutput/", []) catalog_node.append(pkgNode) if not os.path.isdir("testOutput2"):