expand tests

Author: GeigerJ2

src/aiida/cmdline/commands/cmd_archive.py

@@ -338,7 +338,7 @@ class ExtrasImportCode(Enum):
     '--extras-mode-new',
     type=click.Choice(EXTRAS_MODE_NEW),
     default='import',
-    help='Specify whether to import extras of new nodes: ' 'import: import extras. ' 'none: do not import extras.',
+    help='Specify whether to import extras of new nodes: import: import extras. none: do not import extras.',
 )
 @click.option(
     '--comment-mode',

src/aiida/tools/archive/create.py

@@ -247,7 +247,7 @@ def querybuilder():
                 entity_ids[EntityTypes.USER].add(entry.pk)
             else:
                 raise ArchiveExportError(
-                    f'I was given {entry} ({type(entry)}),' ' which is not a User, Node, Computer, or Group instance'
+                    f'I was given {entry} ({type(entry)}), which is not a User, Node, Computer, or Group instance'
                 )
         group_nodes, link_data = _collect_required_entities(
             querybuilder,
@@ -712,7 +712,7 @@ def _check_unsealed_nodes(querybuilder: QbType, node_ids: set[int], batch_size:
     if unsealed_node_pks:
         raise ExportValidationError(
             'All ProcessNodes must be sealed before they can be exported. '
-            f"Node(s) with PK(s): {', '.join(str(pk) for pk in unsealed_node_pks)} is/are not sealed."
+            f'Node(s) with PK(s): {", ".join(str(pk) for pk in unsealed_node_pks)} is/are not sealed.'
         )
 
 
@@ -803,18 +803,18 @@ def get_init_summary(
     """Get summary for archive initialisation"""
     parameters = [['Path', str(outfile)], ['Version', archive_version], ['Compression', compression]]
 
-    result = f"\n{tabulate(parameters, headers=['Archive Parameters', ''])}"
+    result = f'\n{tabulate(parameters, headers=["Archive Parameters", ""])}'
 
     inclusions = [
         ['Computers/Nodes/Groups/Users', 'All' if collect_all else 'Selected'],
         ['Computer Authinfos', include_authinfos],
         ['Node Comments', include_comments],
         ['Node Logs', include_logs],
     ]
-    result += f"\n\n{tabulate(inclusions, headers=['Inclusion rules', ''])}"
+    result += f'\n\n{tabulate(inclusions, headers=["Inclusion rules", ""])}'
 
     if not collect_all:
-        rules_table = [[f"Follow links {' '.join(name.split('_'))}s", value] for name, value in traversal_rules.items()]
-        result += f"\n\n{tabulate(rules_table, headers=['Traversal rules', ''])}"
+        rules_table = [[f'Follow links {" ".join(name.split("_"))}s', value] for name, value in traversal_rules.items()]
+        result += f'\n\n{tabulate(rules_table, headers=["Traversal rules", ""])}'
 
     return result + '\n'

tests/cmdline/commands/test_archive_create.py

@@ -208,3 +208,17 @@ def test_info_empty_archive(run_cli_command):
     filename_input = get_archive_file('empty.aiida', filepath='export/migrate')
     result = run_cli_command(cmd_archive.archive_info, [filename_input], raises=True)
     assert 'archive file unreadable' in result.output
+
+
+def test_create_tmp_dir_option(run_cli_command, tmp_path):
+    """Test that the --tmp-dir CLI option passes through correctly."""
+    node = Dict().store()
+
+    custom_tmp = tmp_path / 'custom_tmp'
+    custom_tmp.mkdir()
+    filename_output = tmp_path / 'archive.aiida'
+
+    options = ['--tmp-dir', str(custom_tmp), '-N', node.pk, '--', filename_output]
+
+    run_cli_command(cmd_archive.create, options)
+    assert filename_output.is_file()

tests/tools/archive/test_simple.py

@@ -158,7 +158,7 @@ def crashing_filter(_):
 
 
 @pytest.mark.usefixtures('aiida_profile_clean')
-def test_tmp_dir(tmp_path, aiida_profile_clean):
+def test_tmp_dir_basic(tmp_path):
     """Test that tmp_dir parameter is used correctly."""
     node = orm.Int(42).store()
     custom_tmp = tmp_path / 'custom_tmp'
@@ -201,3 +201,68 @@ def mock_temp_dir_error(*args, **kwargs):
     with patch('tempfile.TemporaryDirectory', side_effect=mock_temp_dir_error):
         with pytest.raises(ArchiveExportError, match='Insufficient disk space.*--tmp-dir'):
             create_archive([node], filename=filename, tmp_dir=custom_tmp)
+
+
+@pytest.mark.usefixtures('aiida_profile_clean')
+def test_tmp_dir_auto_create(tmp_path):
+    """Test automatic creation of non-existent tmp_dir."""
+    node = orm.Int(42).store()
+    filename = tmp_path / 'export.aiida'
+    custom_tmp = tmp_path / 'nonexistent_tmp'  # Don't create it!
+
+    create_archive([node], filename=filename, tmp_dir=custom_tmp)
+    assert filename.exists()
+    # Verify the directory was created
+    assert custom_tmp.exists()
+
+
+@pytest.mark.usefixtures('aiida_profile_clean')
+def test_tmp_dir_permission_error(tmp_path):
+    """Test tmp_dir permission validation."""
+    import stat
+
+    node = orm.Int(42).store()
+    filename = tmp_path / 'export.aiida'
+    readonly_tmp = tmp_path / 'readonly_tmp'
+    readonly_tmp.mkdir()
+
+    # Make directory read-only
+    readonly_tmp.chmod(stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
+
+    try:
+        with pytest.raises(ArchiveExportError, match='is not writable'):
+            create_archive([node], filename=filename, tmp_dir=readonly_tmp)
+    finally:
+        # Restore permissions for cleanup
+        readonly_tmp.chmod(stat.S_IRWXU)
+
+
+@pytest.mark.usefixtures('aiida_profile_clean')
+def test_tmp_dir_default_behavior(tmp_path):
+    """Test default tmp_dir behavior (no tmp_dir specified)."""
+    node = orm.Int(42).store()
+    filename = tmp_path / 'export.aiida'
+
+    # Don't specify tmp_dir - test the default path
+    create_archive([node], filename=filename)
+    assert filename.exists()
+
+
+@pytest.mark.usefixtures('aiida_profile_clean')
+def test_tmp_dir_general_os_error(tmp_path):
+    """Test general OS error handling."""
+    from unittest.mock import patch
+
+    node = orm.Int(42).store()
+    custom_tmp = tmp_path / 'custom_tmp'
+    custom_tmp.mkdir()
+    filename = tmp_path / 'export.aiida'
+
+    def mock_temp_dir_error(*args, **kwargs):
+        error = OSError('Permission denied')
+        error.errno = 13  # Different from 28
+        raise error
+
+    with patch('aiida.tools.archive.create.tempfile.TemporaryDirectory', side_effect=mock_temp_dir_error):
+        with pytest.raises(ArchiveExportError, match='Failed to create temporary directory'):
+            create_archive([node], filename=filename, tmp_dir=custom_tmp)