[#5031] [#5031] More tests fixes

ckan/tests/controllers/test_package.py

@@ -140,8 +140,7 @@ def test_complete_package_with_two_resources(self, app):
 
     # resource upload is tested in TestExampleIUploaderPlugin
 
-    def test_previous_button_works(self):
-        app = self._get_test_app()
+    def test_previous_button_works(self, app):
         env, response = _get_package_new_page(app)
         form = response.forms["dataset-edit"]
         form["name"] = u"previous-button-works"

ckan/tests/logic/action/test_create.py

@@ -8,6 +8,8 @@
 import mock
 import pytest
 
+from werkzeug.datastructures import FileStorage as FlaskFileStorage
+
 import ckan
 import ckan.logic as logic
 import ckan.model as model
@@ -26,9 +28,11 @@
 fake_open = fake_filesystem.FakeFileOpen(fs)
 
 
-class FakeFileStorage(cgi.FieldStorage):
-    def __init__(self, fp, filename):
-        self.file = fp
+class FakeFileStorage(FlaskFileStorage):
+    content_type = None
+
+    def __init__(self, stream, filename):
+        self.stream = stream
         self.filename = filename
         self.name = "upload"
 
@@ -535,7 +539,7 @@ def test_mimetype_by_upload_by_file(self, mock_open):
         NAZKO,1C08,1070,2016/01/05,20,31,,76,16,JAN-01,41
         """
         )
-        test_resource = FakeFileStorage(test_file, "")
+        test_resource = FakeFileStorage(test_file, "test.csv")
 
         context = {}
         params = {

ckan/tests/logic/action/test_update.py

@@ -26,6 +26,15 @@
 fake_open = fake_filesystem.FakeFileOpen(fs)
 
 
+class FakeFileStorage(FlaskFileStorage):
+    content_type = None
+
+    def __init__(self, stream, filename):
+        self.stream = stream
+        self.filename = filename
+        self.name = "upload"
+
+
 def mock_open_if_open_fails(*args, **kwargs):
     try:
         return real_open(*args, **kwargs)
@@ -813,14 +822,6 @@ def test_calling_with_only_id_doesnt_update_anything(self):
 @pytest.mark.usefixtures("clean_db", "with_plugins")
 class TestResourceUpdate(object):
 
-    class FakeFileStorage(FlaskFileStorage):
-        content_type = None
-
-        def __init__(self, stream, filename):
-            self.stream = stream
-            self.filename = filename
-            self.name = "upload"
-
     def test_url_only(self):
         dataset = factories.Dataset()
         resource = factories.Resource(package=dataset, url="http://first")
@@ -1072,7 +1073,7 @@ def test_mimetype_by_upload_by_file(self, mock_open):
         NAZKO,1C08,1070,2016/01/05,20,31,,76,16,JAN-01,41
         """
         )
-        update_resource = TestResourceUpdate.FakeFileStorage(
+        update_resource = FakeFileStorage(
             update_file, "update_test"
         )