Fix failing tests #241

Signed-off-by: tdruez <[email protected]>

Author: tdruez

dje/tests/__init__.py

@@ -14,6 +14,7 @@
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
+from django.core.files.uploadedfile import TemporaryUploadedFile
 from django.db import DEFAULT_DB_ALIAS
 from django.db import connections
 from django.test.runner import DiscoverRunner
@@ -124,3 +125,20 @@ def assertMaxQueries(self, num, func=None, *args, using=DEFAULT_DB_ALIAS, **kwar
 
         with context:
             func(*args, **kwargs)
+
+
+def wrap_as_temp_uploaded_file(file_path):
+    """Wrap an existing file as a Django TemporaryUploadedFile"""
+    temp_file = TemporaryUploadedFile(
+        name=file_path.name,
+        content_type="application/json",
+        size=file_path.stat().st_size,
+        charset="utf-8",
+    )
+
+    # Read and copy file content into the temporary file
+    with open(file_path, "rb") as f:
+        temp_file.write(f.read())
+
+    temp_file.seek(0)  # Reset pointer after writing
+    return temp_file

product_portfolio/tests/test_importers.py

@@ -22,6 +22,7 @@
 from dje.models import Dataspace
 from dje.tests import create_admin
 from dje.tests import create_superuser
+from dje.tests import wrap_as_temp_uploaded_file
 from license_library.models import License
 from license_library.models import LicenseChoice
 from organization.models import Owner
@@ -714,7 +715,8 @@ def setUp(self):
 
     def test_product_portfolio_product_import_from_scan_proper(self):
         scan_input_location = self.testfiles_path / "import_from_scan.json"
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         warnings, created_counts = importer.save()
         self.assertEqual([], warnings)
         self.assertEqual(
@@ -750,14 +752,16 @@ def test_product_portfolio_product_import_from_scan_proper(self):
         self.assertDictEqual(expected_details, resource.additional_details)
 
         # Make sure we do not create duplicates on re-importing
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         warnings, created_counts = importer.save()
         self.assertEqual([], warnings)
         self.assertEqual({}, created_counts)
 
     def test_product_portfolio_product_import_from_scan_scanpipe_results(self):
         scan_input_location = self.testfiles_path / "scancodeio_scan_codebase_results.json"
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         warnings, created_counts = importer.save()
         self.assertEqual([], warnings)
         self.assertEqual(
@@ -790,21 +794,24 @@ def test_product_portfolio_product_import_from_scan_scanpipe_results(self):
         self.assertDictEqual(expected_details, resource.additional_details)
 
         # Make sure we do not create duplicates on re-importing
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         warnings, created_counts = importer.save()
         self.assertEqual([], warnings)
         self.assertEqual({}, created_counts)
 
     def test_product_portfolio_product_import_from_scan_package_without_purl(self):
         scan_input_location = self.testfiles_path / "package_without_purl.json"
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         warnings, created_counts = importer.save()
         self.assertEqual([], warnings)
         self.assertEqual({}, created_counts)
 
     def test_product_portfolio_product_import_from_scan_duplicated_purl_are_imported_once(self):
         scan_input_location = self.testfiles_path / "duplicated_purl.json"
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         warnings, created_counts = importer.save()
 
         self.assertEqual([], warnings)
@@ -828,28 +835,32 @@ def test_product_portfolio_product_import_from_scan_duplicated_purl_are_imported
         self.assertIn("artifacts/six-1.14.0/setup.py", codebase_resources)
 
     def test_product_portfolio_product_import_from_scan_input_file_errors(self):
-        expected = "The file content is not proper JSON."
+        expected = "Invalid JSON file: Expecting value: line 1 column 1 (char 0)"
         scan_input_location = Path(__file__)
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         with self.assertRaisesMessage(ValidationError, expected):
             importer.save()
 
         expected = "The uploaded file is not a proper ScanCode output results."
         scan_input_location = self.testfiles_path / "json_but_not_scan_results.json"
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         with self.assertRaisesMessage(ValidationError, expected):
             importer.save()
 
         options_str = "--copyright --package"
         expected = f"The Scan run is missing those required options: {options_str}"
         scan_input_location = self.testfiles_path / "missing_scancode_options.json"
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         with self.assertRaisesMessage(ValidationError, expected):
             importer.save()
 
         expected = "'This ScanCode.io output does not include packages nor dependencies data."
         scan_input_location = self.testfiles_path / "missing_correct_pipeline.json"
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         with self.assertRaisesMessage(ValidationError, expected):
             importer.save()
 
@@ -859,13 +870,13 @@ def test_product_portfolio_product_import_from_scan_input_data_validation_errors
             "Ensure this value has at most 1024 characters (it has 3466)."
         )
         scan_input_location = self.testfiles_path / "package_data_validation_error.json"
-        importer = ImportFromScan(
-            self.product1, self.super_user, scan_input_location, stop_on_error=True
-        )
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file, stop_on_error=True)
         with self.assertRaisesMessage(ValidationError, expected):
             importer.save()
 
-        importer = ImportFromScan(self.product1, self.super_user, scan_input_location)
+        upload_file = wrap_as_temp_uploaded_file(scan_input_location)
+        importer = ImportFromScan(self.product1, self.super_user, upload_file)
         warnings, created_counts = importer.save()
         expected = [
             "pkg:pypi/six?uuid=bbe2794a-d81a-4728-a66d-5700a3735977 license_expression: "