Skip to content

Commit 040164e

Browse files
genevievehelselmeta-codesync[bot]
authored andcommitted
Fix legacyephemeral_cleanup_test.py to use self.eden.start()
Summary: Fix legacyephemeral_cleanup_test.py failures when run as root in CI. The tests were failing because they called eden start/restart via subprocess without the `--allowRoot` flag. This diff changes the tests to use `self.eden.start()` and `self.eden.restart() `which properly handle using `--allowRoot` in CI example failure: https://www.internalfb.com/intern/testinfra/diagnostics/4785074941864738.562950236621714.1767742457/?section=%22summary%22 Reviewed By: vilatto Differential Revision: D90212871 fbshipit-source-id: ad24ccb5718d9d5990362ca1ff13e2770db7b917
1 parent 852c644 commit 040164e

File tree

1 file changed

+3
-55
lines changed

1 file changed

+3
-55
lines changed

eden/integration/legacyephemeral_cleanup_test.py

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88

99

1010
import os
11-
import subprocess
1211
from pathlib import Path
1312

1413
from eden.fs.cli.config import CheckoutConfig, EdenCheckout, EdenInstance
1514

1615
from .lib import testcase
17-
from .lib.find_executables import FindExe
1816

1917

2018
@testcase.eden_repo_test
@@ -87,27 +85,7 @@ def test_start_removes_legacyephemeral_but_preserves_normal_checkouts(self) -> N
8785
len(normal_checkouts_before), 0, "Should have at least one normal checkout"
8886
)
8987

90-
edenfsctl, env = FindExe.get_edenfsctl_env()
91-
start_cmd = [edenfsctl, "--config-dir", str(self.eden.eden_dir), "start"]
92-
result = subprocess.run(
93-
start_cmd,
94-
env=env,
95-
capture_output=True,
96-
text=True,
97-
)
98-
99-
self.assertEqual(
100-
result.returncode,
101-
0,
102-
f"eden start failed: {result.stdout}\n{result.stderr}",
103-
)
104-
105-
output = result.stdout + result.stderr
106-
self.assertIn("legacyephemeral", output.lower())
107-
self.assertTrue(
108-
"removing" in output.lower() or "removed" in output.lower(),
109-
"Output should mention removing or removed",
110-
)
88+
self.eden.start()
11189

11290
checkouts_after = instance.get_checkouts()
11391
checkout_paths_after = {str(c.path) for c in checkouts_after}
@@ -147,29 +125,7 @@ def test_restart_removes_legacyephemeral_checkout(self) -> None:
147125
checkout_paths_before = {str(c.path) for c in checkouts_before}
148126
self.assertIn(str(ephemeral_mount), checkout_paths_before)
149127

150-
edenfsctl, env = FindExe.get_edenfsctl_env()
151-
restart_cmd = [
152-
edenfsctl,
153-
"--config-dir",
154-
str(self.eden.eden_dir),
155-
"restart",
156-
"--force",
157-
]
158-
result = subprocess.run(
159-
restart_cmd,
160-
env=env,
161-
capture_output=True,
162-
text=True,
163-
)
164-
165-
self.assertEqual(
166-
result.returncode,
167-
0,
168-
f"eden restart failed: {result.stdout}\n{result.stderr}",
169-
)
170-
171-
output = result.stdout + result.stderr
172-
self.assertIn("legacyephemeral", output.lower())
128+
self.eden.restart()
173129

174130
checkouts_after = instance.get_checkouts()
175131
checkout_paths_after = {str(c.path) for c in checkouts_after}
@@ -196,15 +152,7 @@ def test_multiple_legacyephemeral_checkouts_removed(self) -> None:
196152
self.assertIn(str(ephemeral2), checkout_paths_before)
197153
self.assertIn(str(ephemeral3), checkout_paths_before)
198154

199-
edenfsctl, env = FindExe.get_edenfsctl_env()
200-
start_cmd = [edenfsctl, "--config-dir", str(self.eden.eden_dir), "start"]
201-
result = subprocess.run(start_cmd, env=env, capture_output=True, text=True)
202-
203-
self.assertEqual(result.returncode, 0)
204-
205-
output = result.stdout + result.stderr
206-
self.assertIn("3", output)
207-
self.assertIn("legacyephemeral", output.lower())
155+
self.eden.start()
208156

209157
checkouts_after = instance.get_checkouts()
210158
checkout_paths_after = {str(c.path) for c in checkouts_after}

0 commit comments

Comments
 (0)