fix(rebase): correct test_cached_lookup key and drop duplicate test
test / stage-firecracker-inputs (pull_request) Successful in 2s
test / integration-docker (pull_request) Successful in 8s
tracker-policy-pr / check-pr (pull_request) Successful in 15s
test / unit (pull_request) Successful in 31s
lint / lint (push) Successful in 44s
test / build-infra (pull_request) Successful in 3m39s
test / integration-firecracker (pull_request) Successful in 1m52s
test / coverage (pull_request) Failing after 1m58s
test / publish-infra (pull_request) Has been skipped
test / stage-firecracker-inputs (pull_request) Successful in 2s
test / integration-docker (pull_request) Successful in 8s
tracker-policy-pr / check-pr (pull_request) Successful in 15s
test / unit (pull_request) Successful in 31s
lint / lint (push) Successful in 44s
test / build-infra (pull_request) Successful in 3m39s
test / integration-firecracker (pull_request) Successful in 1m52s
test / coverage (pull_request) Failing after 1m58s
test / publish-infra (pull_request) Has been skipped
Two issues introduced by the rebase conflict resolution: - test_cached_lookup_requires_ready_marker used _dockerfile_hash as the cache-dir key, but cached_agent_rootfs_dir now uses _rootfs_digest (which also folds in the guest init). Updated the test to match. - test_pyproject_toml_change_bumps_version appeared twice in test_infra_artifact.py (once from main, once from the PR commit that added pyproject.toml support). Removed the duplicate. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -36,7 +36,7 @@ class TestBuildAgentRootfsDir(unittest.TestCase):
|
||||
self.assertEqual(base, out)
|
||||
|
||||
def test_cached_lookup_requires_ready_marker(self):
|
||||
digest = image_builder._dockerfile_hash(self.dockerfile)
|
||||
digest = image_builder._rootfs_digest(self.dockerfile)
|
||||
base = self.cache / "rootfs" / f"agent-{digest}"
|
||||
base.mkdir(parents=True)
|
||||
with patch.object(image_builder.util, "cache_dir", return_value=self.cache):
|
||||
|
||||
@@ -134,16 +134,6 @@ class TestVersionInputs(unittest.TestCase):
|
||||
after = ia.infra_artifact_version("init", repo_root=root)
|
||||
self.assertNotEqual(before, after)
|
||||
|
||||
def test_pyproject_toml_change_bumps_version(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as d:
|
||||
root = Path(d)
|
||||
self._fake_repo(root)
|
||||
before = ia.infra_artifact_version("init", repo_root=root)
|
||||
(root / "pyproject.toml").write_text(
|
||||
"[project]\nname = 'bot-bottle'\ndependencies = ['httpx']\n")
|
||||
after = ia.infra_artifact_version("init", repo_root=root)
|
||||
self.assertNotEqual(before, after)
|
||||
|
||||
def test_pyc_and_pycache_ignored(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as d:
|
||||
root = Path(d)
|
||||
|
||||
Reference in New Issue
Block a user