Changeset 864:5b9314d4385a

Timestamp:

03/10/10 18:38:10 (6 months ago)

Author:

johnbywater

Branch:

default

Message:

Fixed licenses checks in functional/test_rest.py.

Files:

• ckan/tests/functional/test_rest.py (modified) (3 diffs)

ckan/tests/functional/test_rest.py

@@ -119 +119 @@
         anna = model.Package.by_name(u'annakarenina')
         assert 'annakarenina' in res, res
-#        assert '"license_id": 9' in res, res
         assert 'license_id' not in res, res
         assert '"license": "other-open"' in res, str(res)
@@ -184 +183 @@
         assert pkg.title == self.testpackagevalues['title'], pkg
         assert pkg.url == self.testpackagevalues['url'], pkg
-        assert pkg.license_id == self.testpackage_license_id, pkg
+        assert pkg.license.id == self.testpackage_license_id, pkg
         assert len(pkg.tags) == 2
         assert len(pkg.extras) == 2, len(pkg.extras)
@@ -200 +199 @@
         res = self.app.get(offset, status=[200])
         assert self.testpackagevalues['name'] in res, res
-#        assert '"license_id": %s' % self.testpackagevalues['license_id'] in res, res
-        #assert '"license": "%s"' % self.testpackagevalues['license'] in res, res
+        assert 'license_id' not in res, res
+        assert '"license": "%s"' % self.testpackagevalues['license'] in res, res
         assert self.testpackagevalues['tags'][0] in res, res
         assert self.testpackagevalues['tags'][1] in res, res