Move path validation, and fix failing tests

Author: GeigerJ2

src/aiida/tools/archive/create.py

@@ -187,26 +187,6 @@ def querybuilder():
         name: traversal_rules.get(name, rule.default) for name, rule in GraphTraversalRules.EXPORT.value.items()
     }
 
-    # Handle temporary directory configuration
-    tmp_prefix = '.aiida-export-'
-    if tmp_dir is not None:
-        tmp_dir = Path(tmp_dir)
-        if not tmp_dir.exists():
-            EXPORT_LOGGER.warning(f"Specified temporary directory '{tmp_dir}' doesn't exist. Creating it.")
-            tmp_dir.mkdir(parents=False)
-        if not tmp_dir.is_dir():
-            msg = f"Specified temporary directory '{tmp_dir}' is not a directory"
-            raise ArchiveExportError(msg)
-        # Check if directory is writable
-        # Taken from: https://stackoverflow.com/a/2113511
-        if not os.access(tmp_dir, os.W_OK | os.X_OK):
-            msg = f"Specified temporary directory '{tmp_dir}' is not writable"
-            raise ArchiveExportError(msg)
-
-    else:
-        # Create temporary directory in the same folder as the output file
-        tmp_dir = filename.parent
-
     initial_summary = get_init_summary(
         archive_version=archive_format.latest_version,
         outfile=filename,
@@ -308,10 +288,29 @@ def querybuilder():
 
     EXPORT_LOGGER.report(f'Creating archive with:\n{tabulate(count_summary)}')
 
+    # Handle temporary directory configuration
+    tmp_prefix = '.aiida-export-'
+    if tmp_dir is not None:
+        tmp_dir = Path(tmp_dir)
+        if not tmp_dir.exists():
+            EXPORT_LOGGER.warning(f"Specified temporary directory '{tmp_dir}' doesn't exist. Creating it.")
+            tmp_dir.mkdir(parents=False)
+        if not tmp_dir.is_dir():
+            msg = f"Specified temporary directory '{tmp_dir}' is not a directory"
+            raise ArchiveExportError(msg)
+        # Check if directory is writable
+        # Taken from: https://stackoverflow.com/a/2113511
+        if not os.access(tmp_dir, os.W_OK | os.X_OK):
+            msg = f"Specified temporary directory '{tmp_dir}' is not writable"
+            raise ArchiveExportError(msg)
+
+    else:
+        # Create temporary directory in the same folder as the output file
+        tmp_dir = filename.parent
+
     # Create and open the archive for writing.
     # We create in a temp dir then move to final place at end,
     # so that the user cannot end up with a half written archive on errors
-
     try:
         tmp_dir.mkdir(parents=True, exist_ok=True)
         with tempfile.TemporaryDirectory(dir=tmp_dir, prefix=tmp_prefix) as tmpdir:

tests/tools/archive/test_simple.py

@@ -178,7 +178,7 @@ def test_tmp_dir_custom_valid(tmp_path):
         create_archive([node], filename=filename, tmp_dir=custom_tmp)
 
         # Check that TemporaryDirectory was called with custom directory
-        mock_temp_dir.assert_called_once_with(dir=custom_tmp, prefix=None)
+        mock_temp_dir.assert_called_once_with(dir=custom_tmp, prefix='.aiida-export-')
 
 
 @pytest.mark.usefixtures('aiida_profile_clean')
@@ -188,10 +188,6 @@ def test_tmp_dir_validation_errors(tmp_path):
     node = orm.Int(42).store()
     filename = tmp_path / 'export.aiida'
 
-    # Non-existent directory
-    with pytest.raises(ArchiveExportError, match='does not exist'):
-        create_archive([node], filename=filename, tmp_dir=tmp_path / 'nonexistent')
-
     # File instead of directory
     not_a_dir = tmp_path / 'file.txt'
     not_a_dir.write_text('content')