summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-01 23:07:59 +0000
committerGerrit Code Review <review@openstack.org>2015-07-01 23:07:59 +0000
commitff6ebdbc3dc2c0c296234e1c829c84e707df4054 (patch)
treed1cb2ef64da4ba1dde1b7cdc86f876b2f3ba46f8
parent376dfb43c56d3b143e77651f8621f9f54498143f (diff)
parentd81b2b482bbe3af2bac4e4a19af56acab746bc74 (diff)
downloadpycadf-ff6ebdbc3dc2c0c296234e1c829c84e707df4054.tar.gz
Merge "ensure id is not empty"
-rw-r--r--pycadf/identifier.py2
-rw-r--r--pycadf/tests/test_cadf_spec.py5
2 files changed, 7 insertions, 0 deletions
diff --git a/pycadf/identifier.py b/pycadf/identifier.py
index 8c74fb6..de9e8eb 100644
--- a/pycadf/identifier.py
+++ b/pycadf/identifier.py
@@ -49,4 +49,6 @@ def is_valid(value):
"""
if not isinstance(value, six.string_types):
raise TypeError
+ elif not value:
+ return False
return True
diff --git a/pycadf/tests/test_cadf_spec.py b/pycadf/tests/test_cadf_spec.py
index 9ba9676..afa1da1 100644
--- a/pycadf/tests/test_cadf_spec.py
+++ b/pycadf/tests/test_cadf_spec.py
@@ -34,6 +34,11 @@ from pycadf import timestamp
class TestCADFSpec(base.TestCase):
+
+ def test_identifier_empty(self):
+ self.assertFalse(identifier.is_valid(''))
+ self.assertTrue(identifier.is_valid(identifier.generate_uuid()))
+
def test_endpoint(self):
endp = endpoint.Endpoint(url='http://192.168.0.1',
name='endpoint name',