From acf03bcc94d7271b9c038586fdcbbf19b04a03d9 Mon Sep 17 00:00:00 2001 From: tobes Date: Fri, 12 Oct 2012 10:17:30 +0100 Subject: [PATCH] [#2939] Fix tests in tests/functional/api/model/test_package.py --- .../functional/api/model/test_package.py | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/ckan/tests/functional/api/model/test_package.py b/ckan/tests/functional/api/model/test_package.py index 2ef306b42dd..486a2a7887c 100644 --- a/ckan/tests/functional/api/model/test_package.py +++ b/ckan/tests/functional/api/model/test_package.py @@ -55,7 +55,7 @@ def test_register_post_ok(self): postparams = '%s=1' % self.dumps(self.package_fixture_data) res = self.app.post(offset, params=postparams, status=self.STATUS_201_CREATED, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) # Check the returned package is as expected pkg = self.loads(res.body) @@ -119,7 +119,7 @@ def test_register_post_ok(self): offset = self.package_offset() postparams = '%s=1' % self.dumps(self.package_fixture_data) res = self.app.post(offset, params=postparams, status=self.STATUS_409_CONFLICT, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) model.Session.remove() def test_register_post_with_group(self): @@ -209,7 +209,7 @@ def test_register_post_json(self): offset = self.package_offset() data = self.dumps(self.package_fixture_data) res = self.post_json(offset, data, status=self.STATUS_201_CREATED, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) # Check the database record. model.Session.remove() package = self.get_package_by_name(self.package_fixture_data['name']) @@ -224,7 +224,7 @@ def test_register_post_bad_content_type(self): content_type='something/unheard_of', status=[self.STATUS_400_BAD_REQUEST, self.STATUS_201_CREATED], - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) model.Session.remove() # Some versions of webob work, some don't. No matter, we record this # behaviour. @@ -243,7 +243,7 @@ def test_register_post_bad_request(self): offset = self.offset('/rest/dataset') postparams = '%s=1' % self.dumps(test_params) res = self.app.post(offset, params=postparams, status=self.STATUS_400_BAD_REQUEST, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) def test_register_post_denied(self): offset = self.offset('/rest/dataset') @@ -259,7 +259,7 @@ def test_register_post_readonly_fields(self): postparams = '%s=1' % self.dumps(data) res = self.app.post(offset, params=postparams, status=self.STATUS_409_CONFLICT, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) assert_equal(res.body, '{"id": ["The input field id was not expected."]}') def test_register_post_indexerror(self): @@ -276,7 +276,7 @@ def test_register_post_indexerror(self): offset = self.package_offset() data = self.dumps(self.package_fixture_data) - self.post_json(offset, data, status=500, extra_environ=self.extra_environ) + self.post_json(offset, data, status=500, extra_environ=self.admin_extra_environ) model.Session.remove() finally: plugins.unload('synchronous_search') @@ -289,7 +289,7 @@ def test_register_post_tag_too_long(self): offset = self.package_offset() data = self.dumps(pkg) res = self.post_json(offset, data, status=self.STATUS_409_CONFLICT, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) assert 'length is more than maximum 100' in res.body, res.body assert 'tagok' not in res.body @@ -324,7 +324,7 @@ def test_entity_get_then_post(self): postparams = '%s=1' % self.dumps(data) res = self.app.post(offset, params=postparams, status=self.STATUS_200_OK, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) data_returned = self.loads(res.body) assert_equal(data['name'], data_returned['name']) assert_equal(data['license_id'], data_returned['license_id']) @@ -360,7 +360,7 @@ def test_entity_post_changed_readonly(self): postparams = '%s=1' % self.dumps(data) res = self.app.post(offset, params=postparams, status=self.STATUS_409_CONFLICT, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) assert "Cannot change value of key from" in res.body, res.body assert "to illegally changed value. This key is read-only" in res.body, res.body @@ -378,7 +378,7 @@ def test_09_update_package_entity_not_found(self): postparams = '%s=1' % self.dumps(self.package_fixture_data) res = self.app.post(offset, params=postparams, status=self.STATUS_404_NOT_FOUND, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) def create_package_with_admin_user(self, package_data): '''Creates a package with self.user as admin and provided package_data. @@ -433,7 +433,7 @@ def assert_package_update_ok(self, package_ref_attribute, params = '%s=1' % self.dumps(new_fixture_data) method_func = getattr(self.app, method_str) res = method_func(offset, params=params, status=self.STATUS_200_OK, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) try: # Check the returned package is as expected @@ -525,7 +525,7 @@ def test_package_update_invalid(self): params = '%s=1' % self.dumps(new_fixture_data) res = self.app.post(offset, params=params, status=self.STATUS_409_CONFLICT, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) res_dict = self.loads(res.body) assert len(res_dict['resources']) == 2, res_dict['resources'] assert_equal(res_dict['resources'][0], {u'size': [u'Invalid integer']}) @@ -548,7 +548,7 @@ def test_package_update_delete_last_extra(self): offset = self.package_offset(old_fixture_data['name']) params = '%s=1' % self.dumps(new_fixture_data) res = self.app.post(offset, params=params, status=self.STATUS_200_OK, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) try: # Check the returned package is as expected @@ -582,7 +582,7 @@ def test_package_update_do_not_delete_last_extra(self): offset = self.package_offset(old_fixture_data['name']) params = '%s=1' % self.dumps(new_fixture_data) res = self.app.post(offset, params=params, status=self.STATUS_200_OK, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) try: # Check the returned package is as expected @@ -613,7 +613,7 @@ def test_entity_update_readd_tag(self): offset = self.package_offset(name) params = '%s=1' % self.dumps(new_fixture_data) res = self.app.post(offset, params=params, status=self.STATUS_200_OK, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) # Check the returned package is as expected pkg = self.loads(res.body) @@ -626,7 +626,7 @@ def test_entity_update_readd_tag(self): # now reinstate the tag params = '%s=1' % self.dumps(old_fixture_data) res = self.app.post(offset, params=params, status=self.STATUS_200_OK, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) pkg = self.loads(res.body) assert_equal(pkg['tags'], ['tag 1.', 'tag2']) @@ -640,7 +640,8 @@ def test_entity_update_conflict(self): try: package1_offset = self.package_offset(package1_name) # trying to rename package 1 to package 2's name - self.post(package1_offset, package2_data, self.STATUS_409_CONFLICT) + print package1_offset, package2_data + self.post(package1_offset, package2_data, self.STATUS_409_CONFLICT, extra_environ=self.admin_extra_environ) finally: self.purge_package_by_name(package2_name) @@ -695,7 +696,7 @@ def test_package_update_delete_resource(self): offset = self.package_offset(old_fixture_data['name']) params = '%s=1' % self.dumps(new_fixture_data) res = self.app.post(offset, params=params, status=self.STATUS_200_OK, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) try: # Check the returned package is as expected @@ -741,7 +742,7 @@ def test_entity_delete_not_found(self): assert not model.Session.query(model.Package).filter_by(name=package_name).count() offset = self.offset('/rest/dataset/%s' % package_name) res = self.app.delete(offset, status=self.STATUS_404_NOT_FOUND, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) def test_package_revisions(self): # check original revision @@ -787,7 +788,7 @@ def test_06_create_pkg_using_download_url(self): offset = self.package_offset() postparams = '%s=1' % self.dumps(test_params) res = self.app.post(offset, params=postparams, - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) model.Session.remove() pkg = self.get_package_by_name(test_params['name']) assert pkg @@ -818,7 +819,7 @@ def test_10_edit_pkg_with_download_url(self): offset = self.package_offset(test_params['name']) postparams = '%s=1' % self.dumps(pkg_vals) res = self.app.post(offset, params=postparams, status=[200], - extra_environ=self.extra_environ) + extra_environ=self.admin_extra_environ) model.Session.remove() pkg = model.Session.query(model.Package).filter_by(name=test_params['name']).one() assert len(pkg.resources) == 1, pkg.resources