Skip to content

Commit 1ca2fa5

Browse files
authored
Merge pull request #554 from NVIDIA/am/fix-type
Fix invalid type for image when cache is disabled
2 parents 85c987b + d5fa69f commit 1ca2fa5

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

src/cloudai/util/docker_image_cache_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def check_docker_image_exists(self, docker_image_url: str, docker_image_filename
157157

158158
# If not caching locally, return True. Defer checking URL accessibility to srun.
159159
if not self.system.cache_docker_images_locally:
160-
return DockerImageCacheResult(True, Path(docker_image_url), "")
160+
return DockerImageCacheResult(True, None, "")
161161

162162
docker_image_path = Path(docker_image_url)
163163
if docker_image_path.is_file() and docker_image_path.exists():

tests/test_docker_image_cache_manager.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,7 @@ def test_ensure_docker_image_no_local_cache(slurm_system: SlurmSystem):
192192
result = manager.ensure_docker_image("docker.io/hello-world", "docker_image.sqsh")
193193

194194
assert result.success
195-
assert result.docker_image_path is not None
196-
assert str(result.docker_image_path) == "docker.io/hello-world"
197-
assert not result.docker_image_path.is_absolute()
195+
assert result.docker_image_path is None
198196
assert result.message == ""
199197

200198

tests/test_slurm_installer.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ def test_is_installed_when_cache_exists(self, installer: SlurmInstaller):
8181
assert res.message == f"Cached Docker image already exists at {cached_file}."
8282
assert d.installed_path == cached_file
8383

84+
def test_cache_disabled(self, installer: SlurmInstaller):
85+
d = DockerImage("fake_url/img")
86+
installer.system.cache_docker_images_locally = False
87+
res = installer.is_installed_one(d)
88+
assert res.success
89+
assert d.installed_path == d.url
90+
8491

8592
class TestInstallOneGitRepo:
8693
@pytest.fixture

0 commit comments

Comments
 (0)