forks/archivebox
1
0
Fork 0
Code Releases Activity

fix tests

Browse source
This commit is contained in:
Nick Sweeting 2021-02-18 04:26:56 -05:00
parent 13c2b7c8eb
commit 46a4197514
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archivebox/index/sql.py
View file

@ -61,7 +61,7 @@ def write_link_to_sql_index(link: Link):
} }
) )
else: else:
result, _ = ArchiveResult.objects.create_or_update( result, _ = ArchiveResult.objects.update_or_create(
snapshot_id=snapshot.id, snapshot_id=snapshot.id,
extractor=extractor, extractor=extractor,
start_ts=parse_date(entry.start_ts), start_ts=parse_date(entry.start_ts),

6
tests/test_init.py
View file

@ -12,12 +12,12 @@ from archivebox.config import OUTPUT_PERMISSIONS
from .fixtures import * from .fixtures import *
def test_init(tmp_path, process): def test_init(tmp_path, process):
assert "Initializing a new ArchiveBox collection in this folder..." in process.stdout.decode("utf-8") assert "Initializing a new ArchiveBox" in process.stdout.decode("utf-8")
def test_update(tmp_path, process): def test_update(tmp_path, process):
os.chdir(tmp_path) os.chdir(tmp_path)
update_process = subprocess.run(['archivebox', 'init'], capture_output=True) update_process = subprocess.run(['archivebox', 'init'], capture_output=True)
assert "Updating existing ArchiveBox collection in this folder" in update_process.stdout.decode("utf-8") assert "updating existing ArchiveBox" in update_process.stdout.decode("utf-8")
def test_add_link(tmp_path, process, disable_extractors_dict): def test_add_link(tmp_path, process, disable_extractors_dict):
disable_extractors_dict.update({"USE_WGET": "true"}) disable_extractors_dict.update({"USE_WGET": "true"})
@ -173,4 +173,4 @@ def test_tags_migration(tmp_path, disable_extractors_dict):
snapshot_id = tag["id"] snapshot_id = tag["id"]
tag_name = tag["name"] tag_name = tag["name"]
# Check each tag migrated is in the previous field # Check each tag migrated is in the previous field
assert tag_name in snapshots_dict[snapshot_id] assert tag_name in snapshots_dict[snapshot_id]

6
tests/test_remove.py
View file

@ -100,7 +100,7 @@ def test_remove_before(tmp_path, process, disable_extractors_dict):
conn = sqlite3.connect("index.sqlite3") conn = sqlite3.connect("index.sqlite3")
c = conn.cursor() c = conn.cursor()
timestamp = c.execute("SELECT timestamp FROM core_snapshot ORDER BY timestamp ASC").fetchall() timestamp = c.execute("SELECT timestamp FROM core_snapshot ORDER BY timestamp DSC").fetchall()
conn.commit() conn.commit()
conn.close() conn.close()
@ -118,7 +118,7 @@ def test_remove_after(tmp_path, process, disable_extractors_dict):
conn = sqlite3.connect("index.sqlite3") conn = sqlite3.connect("index.sqlite3")
c = conn.cursor() c = conn.cursor()
timestamp = c.execute("SELECT timestamp FROM core_snapshot ORDER BY timestamp ASC").fetchall() timestamp = c.execute("SELECT timestamp FROM core_snapshot ORDER BY timestamp DSC").fetchall()
conn.commit() conn.commit()
conn.close() conn.close()
@ -127,4 +127,4 @@ def test_remove_after(tmp_path, process, disable_extractors_dict):
subprocess.run(['archivebox', 'remove', '--filter-type=regex', '.*', '--yes', '--delete', '--after', str(after[1])], capture_output=True) subprocess.run(['archivebox', 'remove', '--filter-type=regex', '.*', '--yes', '--delete', '--after', str(after[1])], capture_output=True)
assert (tmp_path / "archive" / timestamp[1][0]).exists() assert (tmp_path / "archive" / timestamp[1][0]).exists()
assert not (tmp_path / "archive" / timestamp[0][0]).exists() assert not (tmp_path / "archive" / timestamp[0][0]).exists()