From ba4f348a0522bf17f851813e17beebe58f4e6a24 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Fri, 12 Oct 2012 10:22:35 +0100
Subject: [PATCH] [#2939] Fix tests in tests/logic/test_action.py

---
 ckan/tests/logic/test_action.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ckan/tests/logic/test_action.py b/ckan/tests/logic/test_action.py
index aa5f1fb3d2c..52e3d730d0c 100644
--- a/ckan/tests/logic/test_action.py
+++ b/ckan/tests/logic/test_action.py
@@ -150,13 +150,13 @@ def test_03_create_update_package(self):
         wee = json.dumps(package)
         postparams = '%s=1' % json.dumps(package)
         res = self.app.post('/api/action/package_create', params=postparams,
-                            extra_environ={'Authorization': 'tester'})
+                            extra_environ={'Authorization': str(self.sysadmin_user.apikey)})
         package_created = json.loads(res.body)['result']
         print package_created
         package_created['name'] = 'moo'
         postparams = '%s=1' % json.dumps(package_created)
         res = self.app.post('/api/action/package_update', params=postparams,
-                            extra_environ={'Authorization': 'tester'})
+                            extra_environ={'Authorization': str(self.sysadmin_user.apikey)})
 
         package_updated = json.loads(res.body)['result']
         package_updated.pop('revision_id')
@@ -196,7 +196,7 @@ def test_41_create_resource(self):
 
         anna_id = model.Package.by_name(u'annakarenina').id
         resource = {'package_id': anna_id, 'url': 'http://new_url'}
-        api_key = model.User.get('annafan').apikey.encode('utf8')
+        api_key = model.User.get('testsysadmin').apikey.encode('utf8')
         postparams = '%s=1' % json.dumps(resource)
         res = self.app.post('/api/action/resource_create', params=postparams,
                             extra_environ={'Authorization': api_key })
@@ -209,7 +209,7 @@ def test_42_create_resource_with_error(self):
 
         anna_id = model.Package.by_name(u'annakarenina').id
         resource = {'package_id': anna_id, 'url': 'new_url', 'created': 'bad_date'}
-        api_key = model.User.get('annafan').apikey.encode('utf8')
+        api_key = model.User.get('testsysadmin').apikey.encode('utf8')
 
         postparams = '%s=1' % json.dumps(resource)
         res = self.app.post('/api/action/resource_create', params=postparams,
@@ -557,7 +557,7 @@ def test_19_update_resource(self):
 
         postparams = '%s=1' % json.dumps(package)
         res = self.app.post('/api/action/package_create', params=postparams,
-                            extra_environ={'Authorization': 'tester'})
+                            extra_environ={'Authorization': str(self.sysadmin_user.apikey)})
         package_created = json.loads(res.body)['result']
 
         resource_created = package_created['resources'][0]
@@ -565,7 +565,7 @@ def test_19_update_resource(self):
         resource_created['url'] = new_resource_url
         postparams = '%s=1' % json.dumps(resource_created)
         res = self.app.post('/api/action/resource_update', params=postparams,
-                            extra_environ={'Authorization': 'tester'})
+                            extra_environ={'Authorization': str(self.sysadmin_user.apikey)})
 
         resource_updated = json.loads(res.body)['result']
         assert resource_updated['url'] == new_resource_url, resource_updated
@@ -1164,9 +1164,10 @@ def test_2_update_many(self):
 class TestActionPackageSearch(WsgiAppCase):
 
     @classmethod
-    def setup_class(self):
+    def setup_class(cls):
         setup_test_search_index()
         CreateTestData.create()
+        cls.sysadmin_user = model.User.get('testsysadmin')
 
     @classmethod
     def teardown_class(self):
@@ -1244,7 +1245,7 @@ def test_4_sort_by_metadata_modified(self):
         pkg_dict['tags'].append({'name': 'new-tag'})
         pkg_params = '%s=1' % json.dumps(pkg_dict)
         res = self.app.post('/api/action/package_update', params=pkg_params,
-                            extra_environ={'Authorization': 'tester'})
+                            extra_environ={'Authorization':  str(self.sysadmin_user.apikey)})
 
         res = self.app.post('/api/action/package_search', params=search_params)
         result = json.loads(res.body)['result']
@@ -1303,6 +1304,7 @@ def setup_class(cls):
         setup_test_search_index()
         CreateTestData.create()
         MockPackageSearchPlugin().disable()
+        cls.sysadmin_user = model.User.get('testsysadmin')
 
     @classmethod
     def teardown_class(cls):