diff --git a/archivebox/core/migrations/0025_cleanup_schema.py b/archivebox/core/migrations/0025_cleanup_schema.py index 0753b453..4ab000c4 100644 --- a/archivebox/core/migrations/0025_cleanup_schema.py +++ b/archivebox/core/migrations/0025_cleanup_schema.py @@ -190,7 +190,7 @@ class Migration(migrations.Migration): dependencies = [ ('core', '0024_assign_default_crawl'), - ('machine', '0001_initial'), + ('machine', '0005_add_process_table'), ('crawls', '0002_upgrade_to_0_9_0'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] diff --git a/archivebox/machine/migrations/0001_initial.py b/archivebox/machine/migrations/0001_initial.py index aee3400f..bc83ca7b 100644 --- a/archivebox/machine/migrations/0001_initial.py +++ b/archivebox/machine/migrations/0001_initial.py @@ -153,8 +153,6 @@ class Migration(migrations.Migration): ('id', models.UUIDField(default=uuid7, editable=False, primary_key=True, serialize=False, unique=True)), ('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now)), ('modified_at', models.DateTimeField(auto_now=True)), - ('num_uses_succeeded', models.PositiveIntegerField(default=0)), - ('num_uses_failed', models.PositiveIntegerField(default=0)), ('guid', models.CharField(default=None, editable=False, max_length=64, unique=True)), ('hostname', models.CharField(default=None, max_length=63)), ('hw_in_docker', models.BooleanField(default=False)), diff --git a/archivebox/plugins/ublock/tests/test_ublock.py b/archivebox/plugins/ublock/tests/test_ublock.py index 92b935af..91492d4e 100644 --- a/archivebox/plugins/ublock/tests/test_ublock.py +++ b/archivebox/plugins/ublock/tests/test_ublock.py @@ -712,12 +712,13 @@ const puppeteer = require('{env_base['NODE_MODULES_DIR']}/puppeteer-core'); f"With extension: {ext_result['adElementsVisible']} visible ads\n" \ f"Expected fewer ads with extension." - # Extension should block at least 10% of ads - assert reduction_percent >= 10, \ - f"uBlock should block at least 10% of ads.\n" \ + # Extension should block at least 20% of ads (was consistently blocking 5-13% without proper init time) + assert reduction_percent >= 20, \ + f"uBlock should block at least 20% of ads.\n" \ f"Baseline: {baseline_result['adElementsVisible']} visible ads\n" \ f"With extension: {ext_result['adElementsVisible']} visible ads\n" \ - f"Reduction: only {reduction_percent:.0f}% (expected at least 10%)" + f"Reduction: only {reduction_percent:.0f}% (expected at least 20%)\n" \ + f"Note: Filter lists must be downloaded on first run (takes ~15s)" print(f"\n✓ SUCCESS: uBlock correctly blocks ads!") print(f" - Baseline: {baseline_result['adElementsVisible']} visible ads")