Merge pull request #1154 from sissbruecker/fix/oneshot_exit_code

archivebox/extractors/__init__.py

@@ -162,7 +162,7 @@ def archive_link(link: Link, overwrite: bool=False, methods: Optional[Iterable[s
 
         write_link_details(link, out_dir=out_dir, skip_sql_index=False)
 
-        log_link_archiving_finished(link, link.link_dir, is_new, stats, start_ts)
+        log_link_archiving_finished(link, out_dir, is_new, stats, start_ts)
 
     except KeyboardInterrupt:
         try:

tests/test_oneshot.py

@@ -26,3 +26,35 @@ def test_oneshot_command_saves_page_in_right_folder(tmp_path, disable_extractors
     assert not "index.sqlite3" in current_path
     assert "output.html" in items
 
+def test_oneshot_command_succeeds(tmp_path, disable_extractors_dict):
+    disable_extractors_dict.update({"SAVE_DOM": "true"})
+    process = subprocess.run(
+        [
+            "archivebox",
+            "oneshot",
+            f"--out-dir={tmp_path}",
+            "--extract=title,favicon,dom",
+            "http://127.0.0.1:8080/static/example.com.html",
+        ],
+        capture_output=True,
+        env=disable_extractors_dict,
+    )
+
+    assert process.returncode == 0
+
+def test_oneshot_command_logs_archiving_finished(tmp_path, disable_extractors_dict):
+    disable_extractors_dict.update({"SAVE_DOM": "true"})
+    process = subprocess.run(
+        [
+            "archivebox",
+            "oneshot",
+            f"--out-dir={tmp_path}",
+            "--extract=title,favicon,dom",
+            "http://127.0.0.1:8080/static/example.com.html",
+        ],
+        capture_output=True,
+        env=disable_extractors_dict,
+    )
+
+    output_str = process.stdout.decode("utf-8")
+    assert "4 files" in output_str