Attempted CI test fixes. Also spelling.

tests/end-to-end/hooks/credential/test_container.py

@@ -40,7 +40,7 @@ def test_container_secret():
     original_working_directory = os.getcwd()
     os.chdir(temporary_directory)
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path, secrets_directory=temporary_directory)
 

tests/end-to-end/hooks/credential/test_file.py

@@ -40,7 +40,7 @@ def test_file_credential():
     original_working_directory = os.getcwd()
     os.chdir(temporary_directory)
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         credential_path = os.path.join(temporary_directory, 'mycredential')
         generate_configuration(config_path, repository_path, credential_path)

tests/end-to-end/hooks/credential/test_keepassxc.py

@@ -39,7 +39,7 @@ def test_keepassxc_password():
     original_working_directory = os.getcwd()
     os.chdir(temporary_directory)
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path)
 

tests/end-to-end/hooks/credential/test_systemd.py

@@ -38,7 +38,7 @@ def test_systemd_credential():
     original_working_directory = os.getcwd()
     os.chdir(temporary_directory)
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path)
 

tests/end-to-end/hooks/data_source/test_btrfs.py

@@ -35,7 +35,7 @@ def test_btrfs_create_and_list():
     temporary_directory = tempfile.mkdtemp()
     repository_path = os.path.join(temporary_directory, 'test.borg')
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path)
 

tests/end-to-end/hooks/data_source/test_database.py

@@ -443,7 +443,7 @@ def test_database_dump_and_restore():
 
     original_working_directory = os.getcwd()
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         config = write_configuration(
             temporary_directory,
@@ -501,7 +501,7 @@ def test_database_dump_and_restore_with_restore_cli_flags():
 
     original_working_directory = os.getcwd()
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         config = write_simple_custom_restore_configuration(
             temporary_directory,
@@ -582,7 +582,7 @@ def test_database_dump_and_restore_with_restore_configuration_options():
 
     original_working_directory = os.getcwd()
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         config = write_custom_restore_configuration(
             temporary_directory,
@@ -641,7 +641,7 @@ def test_database_dump_and_restore_with_directory_format():
 
     original_working_directory = os.getcwd()
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         config = write_configuration(
             temporary_directory,
@@ -737,7 +737,7 @@ def test_database_dump_and_restore_containers():
 
     os.environ['PATH'] = f'/app/tests/end-to-end/commands:{original_path}'
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         config = write_container_configuration(
             temporary_directory,

tests/end-to-end/hooks/data_source/test_lvm.py

@@ -41,7 +41,7 @@ def test_lvm_create_and_list():
     temporary_directory = tempfile.mkdtemp()
     repository_path = os.path.join(temporary_directory, 'test.borg')
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path)
 

tests/end-to-end/hooks/data_source/test_zfs.py

@@ -37,7 +37,7 @@ def test_zfs_create_and_list():
     temporary_directory = tempfile.mkdtemp()
     repository_path = os.path.join(temporary_directory, 'test.borg')
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path)
 

tests/end-to-end/hooks/monitoring/test_monitoring.py

@@ -129,7 +129,7 @@ def test_borgmatic_command(monitoring_hook_configuration, expected_request_count
     os.mkdir(extract_path)
     os.chdir(extract_path)
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path, monitoring_hook_configuration)
 

tests/end-to-end/test_borgmatic.py

@@ -76,7 +76,7 @@ def test_borgmatic_command(generate_configuration):
     os.mkdir(extract_path)
     os.chdir(extract_path)
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path)
 

tests/end-to-end/test_environment_variable.py

@@ -44,7 +44,7 @@ def test_borgmatic_command():
     os.chdir(extract_path)
     environment = dict(os.environ, PASSPHRASE='test')
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path)
 

tests/end-to-end/test_passcommand.py

@@ -40,7 +40,7 @@ def test_borgmatic_command():
     os.mkdir(extract_path)
     os.chdir(extract_path)
 
-    try:  # noqa: PLW0717
+    try:
         config_path = os.path.join(temporary_directory, 'test.yaml')
         generate_configuration(config_path, repository_path)