diff --git a/lib/ramble/ramble/test/namespace_trie.py b/lib/ramble/ramble/test/namespace_trie.py index c7cfa08277..d7758f7e0c 100644 --- a/lib/ramble/ramble/test/namespace_trie.py +++ b/lib/ramble/ramble/test/namespace_trie.py @@ -22,7 +22,8 @@ def test_add_single(trie): assert trie.is_prefix("foo") assert trie.has_value("foo") assert trie["foo"] == "bar" - assert not trie.is_leaf("foo") + assert trie.is_leaf("foo") + assert not trie.is_leaf("bar") def test_add_multiple(trie): @@ -30,13 +31,16 @@ def test_add_multiple(trie): assert not trie.has_value("foo") assert trie.is_prefix("foo") + assert not trie.is_leaf("foo") assert trie.is_prefix("foo.bar") assert trie.has_value("foo.bar") assert trie["foo.bar"] == "baz" + assert trie.is_leaf("foo.bar") assert not trie.is_prefix("foo.bar.baz") assert not trie.has_value("foo.bar.baz") + assert not trie.is_leaf("foo.bar.baz") def test_add_three(trie): @@ -45,16 +49,20 @@ def test_add_three(trie): assert trie.is_prefix("foo") assert not trie.has_value("foo") + assert not trie.is_leaf("foo") assert trie.is_prefix("foo.bar") assert not trie.has_value("foo.bar") + assert not trie.is_leaf("foo.bar") assert trie.is_prefix("foo.bar.baz") assert trie.has_value("foo.bar.baz") assert trie["foo.bar.baz"] == "quux" + assert trie.is_leaf("foo.bar.baz") assert not trie.is_prefix("foo.bar.baz.quux") assert not trie.has_value("foo.bar.baz.quux") + assert not trie.is_leaf("foo.bar.baz.quux") # Try to add a second element in a prefix namespace trie["foo.bar"] = "blah" diff --git a/lib/ramble/ramble/util/naming.py b/lib/ramble/ramble/util/naming.py index 960c6d60a0..3734d147b3 100644 --- a/lib/ramble/ramble/util/naming.py +++ b/lib/ramble/ramble/util/naming.py @@ -210,7 +210,7 @@ def is_leaf(self, namespace): """True if this namespace has no children in the trie.""" first, _, rest = namespace.partition(self._sep) if not first: - return bool(self._subspaces) + return not self._subspaces elif first not in self._subspaces: return False else: