Merge branch 'main' into 101-check-vulnerabilities

Author: tdruez

scanpipe/models.py

@@ -649,7 +649,7 @@ def clear_tmp_directory(self):
         pipeline Run.
         """
         shutil.rmtree(self.tmp_path, ignore_errors=True)
-        self.tmp_path.mkdir(exist_ok=True)
+        self.tmp_path.mkdir(parents=True, exist_ok=True)
 
     @property
     def input_sources_list(self):

scanpipe/tests/test_models.py

@@ -113,6 +113,12 @@ def test_scanpipe_project_model_clear_tmp_directory(self):
         self.assertTrue(self.project1.tmp_path.exists())
         self.assertEqual([], list(self.project1.tmp_path.glob("*")))
 
+        self.assertTrue(self.project1.tmp_path.exists())
+        shutil.rmtree(self.project1.work_path, ignore_errors=True)
+        self.assertFalse(self.project1.tmp_path.exists())
+        self.project1.clear_tmp_directory()
+        self.assertTrue(self.project1.tmp_path.exists())
+
     def test_scanpipe_project_model_archive(self):
         (self.project1.input_path / "input_file").touch()
         (self.project1.codebase_path / "codebase_file").touch()

scanpipe/tests/test_views.py

@@ -77,25 +77,16 @@ def test_scanpipe_views_project_list_filters(self):
         """
         self.assertContains(response, is_archived_filters, html=True)
 
-        pipeline_filters = """
-        <li><a href="?pipeline=" class="dropdown-item is-active">All</a></li>
-        <li><a href="?pipeline=docker" class="dropdown-item">docker</a></li>
-        <li>
-          <a href="?pipeline=docker_windows" class="dropdown-item">docker_windows</a>
-        </li>
-        <li>
-          <a href="?pipeline=load_inventory" class="dropdown-item">load_inventory</a>
-        </li>
-        <li>
-          <a href="?pipeline=root_filesystems" class="dropdown-item">
-            root_filesystems
-          </a>
-        </li>
-        <li>
-          <a href="?pipeline=scan_codebase" class="dropdown-item">scan_codebase</a></li>
-        <li><a href="?pipeline=scan_package" class="dropdown-item">scan_package</a></li>
-        """
-        self.assertContains(response, pipeline_filters, html=True)
+        pipeline_filters = [
+            "?pipeline=docker",
+            "?pipeline=docker_windows",
+            "?pipeline=load_inventory",
+            "?pipeline=root_filesystems",
+            "?pipeline=scan_codebase",
+            "?pipeline=scan_package",
+        ]
+        for pipeline_filter in pipeline_filters:
+            self.assertContains(response, pipeline_filter)
 
         status_filters = """
         <li><a href="?status=" class="dropdown-item is-active">All</a></li>