Skip to content

Commit 9ff830f

Browse files
committed
Rework Test Case 0002
Rework Test Case 0002
1 parent cdb35c3 commit 9ff830f

4 files changed

Lines changed: 352 additions & 164 deletions

File tree

ci/e2e/framework/context.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,14 @@ def master_log_file(self) -> Path:
6262

6363
@property
6464
def default_onedrive_config_dir(self) -> Path:
65-
"""
66-
Return the default OneDrive config directory created by the workflow.
67-
"""
6865
xdg_config_home = os.environ.get("XDG_CONFIG_HOME", "").strip()
6966
if xdg_config_home:
7067
return Path(xdg_config_home) / "onedrive"
7168

7269
home = os.environ.get("HOME", "").strip()
7370
if not home:
7471
raise RuntimeError("Neither XDG_CONFIG_HOME nor HOME is set")
72+
7573
return Path(home) / ".config" / "onedrive"
7674

7775
@property
@@ -86,10 +84,7 @@ def ensure_refresh_token_available(self) -> None:
8684

8785
def bootstrap_config_dir(self, config_dir: Path) -> Path:
8886
"""
89-
Create a usable OneDrive config directory for a test case by copying the
90-
existing refresh_token into the supplied config directory.
91-
92-
Returns the path to the copied refresh_token.
87+
Copy the existing refresh_token into a per-test/per-scenario config dir.
9388
"""
9489
self.ensure_refresh_token_available()
9590
ensure_directory(config_dir)

ci/e2e/framework/manifest.py

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,4 @@ def build_manifest(root: Path) -> list[str]:
2323

2424
def write_manifest(path: Path, entries: list[str]) -> None:
2525
path.parent.mkdir(parents=True, exist_ok=True)
26-
path.write_text("\n".join(entries) + ("\n" if entries else ""), encoding="utf-8")
27-
28-
29-
def compare_manifest(
30-
actual_entries: list[str],
31-
expected_present: list[str],
32-
expected_absent: list[str],
33-
) -> list[str]:
34-
"""
35-
Compare actual manifest entries against expected present/absent paths.
36-
37-
Returns a list of diff lines. Empty list means success.
38-
"""
39-
diffs: list[str] = []
40-
actual_set = set(actual_entries)
41-
42-
for expected in expected_present:
43-
if expected not in actual_set:
44-
diffs.append(f"MISSING expected path: {expected}")
45-
46-
for unexpected in expected_absent:
47-
if unexpected in actual_set:
48-
diffs.append(f"FOUND unexpected path: {unexpected}")
49-
50-
return diffs
26+
path.write_text("\n".join(entries) + ("\n" if entries else ""), encoding="utf-8")

ci/e2e/testcases/tc0001_basic_resync.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ class TestCase0001BasicResync(E2ETestCase):
2424

2525
def run(self, context: E2EContext) -> TestResult:
2626

27-
context.ensure_refresh_token_available()
28-
2927
case_work_dir = context.work_root / f"tc{self.case_id}"
3028
case_log_dir = context.logs_dir / f"tc{self.case_id}"
3129
state_dir = context.state_dir / f"tc{self.case_id}"
3230

3331
reset_directory(case_work_dir)
3432
reset_directory(case_log_dir)
3533
reset_directory(state_dir)
34+
35+
context.ensure_refresh_token_available()
3636

3737
stdout_file = case_log_dir / "stdout.log"
3838
stderr_file = case_log_dir / "stderr.log"

0 commit comments

Comments
 (0)