diff options
Diffstat (limited to 'macaroonbakery/tests/test_namespace.py')
| -rw-r--r-- | macaroonbakery/tests/test_namespace.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/macaroonbakery/tests/test_namespace.py b/macaroonbakery/tests/test_namespace.py index 24eda29..2f04bb3 100644 --- a/macaroonbakery/tests/test_namespace.py +++ b/macaroonbakery/tests/test_namespace.py @@ -1,9 +1,8 @@ # Copyright 2017 Canonical Ltd. # Licensed under the LGPLv3, see LICENCE file for details. - from unittest import TestCase -from macaroonbakery import namespace +import macaroonbakery.checkers as checkers class TestNamespace(TestCase): @@ -23,17 +22,17 @@ class TestNamespace(TestCase): }, b'a:one a1:two') ] for test in tests: - ns = namespace.Namespace(test[1]) - data = ns.serialize() + ns = checkers.Namespace(test[1]) + data = ns.serialize_text() self.assertEquals(data, test[2]) self.assertEquals(str(ns), test[2].decode('utf-8')) # Check that it can be deserialize to the same thing: - ns1 = namespace.deserialize_namespace(data) + ns1 = checkers.deserialize_namespace(data) self.assertEquals(ns1, ns) def test_register(self): - ns = namespace.Namespace(None) + ns = checkers.Namespace(None) ns.register('testns', 't') prefix = ns.resolve('testns') self.assertEquals(prefix, 't') @@ -48,11 +47,11 @@ class TestNamespace(TestCase): self.assertEquals(prefix, 'o') def test_register_bad_uri(self): - ns = namespace.Namespace(None) + ns = checkers.Namespace(None) with self.assertRaises(KeyError): ns.register('', 'x') def test_register_bad_prefix(self): - ns = namespace.Namespace(None) + ns = checkers.Namespace(None) with self.assertRaises(ValueError): ns.register('std', 'x:1') |