Fix legacy_action tests

fferreyra · Sep 26, 2019 · ca4464a · ca4464a
1 parent 5729e94
commit ca4464a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py
@@ -756,7 +756,7 @@ def task_status_update(context, data_dict):
 
     '''
     model = context['model']
-    session = model.meta.create_local_session()
+    session = model.Session
     context['session'] = session
 
     user = context['user']

diff --git a/ckan/tests/legacy/logic/test_action.py b/ckan/tests/legacy/logic/test_action.py
@@ -434,7 +434,7 @@ def test_20_task_status_update(self):
 
         task_status_id = task_status_updated.pop('id')
         task_status_updated.pop('last_updated')
-        assert task_status_updated == task_status, (task_status_updated, task_status)
+        assert task_status_updated == task_status
 
         task_status_updated['id'] = task_status_id
         task_status_updated['value'] = u'test_value_2'
@@ -445,7 +445,7 @@ def test_20_task_status_update(self):
         )
         task_status_updated_2 = json.loads(res.body)['result']
         task_status_updated_2.pop('last_updated')
-        assert task_status_updated_2 == task_status_updated, task_status_updated_2
+        assert task_status_updated_2 == task_status_updated
 
     def test_21_task_status_update_many(self):
         package_created = self._add_basic_package(u'test_task_status_update_many')
@@ -592,7 +592,7 @@ def test_26_resource_show(self):
     def test_27_get_site_user_not_authorized(self):
         assert_raises(NotAuthorized,
                      get_action('get_site_user'),
-                     {'model': model}, {})
+                     {'model': model, 'user': ''}, {})
         user = model.User.get('test.ckan.net')
         assert not user