fix: resolve all ruff lint errors and SQLite UNIQUE constraint issue

Ruff fixes (20 errors → 0):
- F401: Remove unused imports (DeckyConfig, random_hostname, IniConfig,
  COMPOSE_FILE, sys, patch) across cli.py, mutator/engine.py,
  templates/ftp, templates/rdp, test_mysql.py, test_postgres.py
- F541: Remove extraneous f-prefixes on strings with no placeholders
  in templates/imap, test_ftp_live, test_http_live
- E741: Rename ambiguous variable 'l' to descriptive names (line, entry,
  part) across conftest.py, test_ftp_live, test_http_live,
  test_mongodb_live, test_pop3, test_ssh

SQLite fix:
- Change _initialize_sync() admin seeding from SELECT-then-INSERT to
  INSERT OR IGNORE, preventing IntegrityError when admin user already
  exists from a previous run
This commit is contained in:
2026-04-12 02:17:50 -04:00
parent 99be4e64ad
commit f78104e1c8
14 changed files with 29 additions and 38 deletions

View File

@@ -83,7 +83,7 @@ def assert_rfc5424(
criteria = {"service": service, "event_type": event_type, **fields}
raise AssertionError(
f"No RFC 5424 line matching {criteria!r} found among {len(lines)} lines:\n"
+ "\n".join(f" {l!r}" for l in lines[:20])
+ "\n".join(f" {line!r}" for line in lines[:20])
)

View File

@@ -35,5 +35,5 @@ class TestFTPLive:
ftp.close()
lines = drain()
# At least one RFC 5424 line from the ftp service
rfc_lines = [l for l in lines if "<" in l and ">1 " in l and "ftp" in l]
assert rfc_lines, f"No ftp RFC 5424 lines found. stdout:\n" + "\n".join(lines[:15])
rfc_lines = [line for line in lines if "<" in line and ">1 " in line and "ftp" in line]
assert rfc_lines, "No ftp RFC 5424 lines found. stdout:\n" + "\n".join(lines[:15])

View File

@@ -28,8 +28,8 @@ class TestHTTPLive:
)
lines = drain()
# body field present in log line
assert any("body=" in l for l in lines if "request" in l), (
f"Expected 'body=' in request log line. Got:\n" + "\n".join(lines[:10])
assert any("body=" in line for line in lines if "request" in line), (
"Expected 'body=' in request log line. Got:\n" + "\n".join(lines[:10])
)
def test_method_and_path_in_log(self, live_service):

View File

@@ -65,6 +65,6 @@ class TestMongoDBLive:
client.close()
lines = drain()
# At least one message was exchanged
assert any("mongodb" in l for l in lines), (
assert any("mongodb" in line for line in lines), (
"Expected at least one mongodb log line"
)