Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ __pycache__
/build/
.pytest_cache
.history
venv/
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ def test_backwards_compatibility(self):
v1_xml = self._get_xml_element(full_v1_xml, name)
v2_xml = self._get_xml_element(full_v2_xml, name)
# Test the version 1 converted to version 2
self.assert_(
self.assertTrue(
xml_equal(v1_to_v2_xml, v2_xml),
"v2 produced from v1 doesn't match loaded:\n{}\n\nand"
"\n\n{}".format(xml_to_str(v1_to_v2_xml, pp=True),
xml_to_str(v2_xml, pp=True)))
# Test the version 2 converted to version 1
self.assert_(
self.assertTrue(
xml_equal(v2_to_v1_xml, v1_xml),
"v1 produced from v2 doesn't match loaded:\n{}\n\nand\n\n"
"{}".format(xml_to_str(v2_to_v1_xml, pp=True),
Expand Down
2 changes: 1 addition & 1 deletion test/unittests/user_test/multi/component_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def test_unused_reduce_ports(self):
name="TestMultiDyn",
sub_components={'cell': test_dyn})

self.assert_(Constant('ADP1__cell', 0.0, un.per_time.origin.units)
self.assertTrue(Constant('ADP1__cell', 0.0, un.per_time.origin.units)
in test_multi.constants,
"Zero-valued constant wasn't inserted for unused reduce "
"port")