Use wait_for_job instead of wait_for_installs

This commit is contained in:
Brandon Rising 2024-03-18 12:23:46 -04:00
parent 1f000306f3
commit 30da11998b

View File

@ -298,19 +298,16 @@ def test_heuristic_import_with_type(mm2_installer: ModelInstallServiceBase, mode
"hash": "placeholder2", "hash": "placeholder2",
} }
assert "repo_id" in model_params assert "repo_id" in model_params
try: install_job1 = mm2_installer.heuristic_import(source=model_params["repo_id"], config=config1)
install_job1 = mm2_installer.heuristic_import(source=model_params["repo_id"], config=config1) mm2_installer.wait_for_job(install_job1, timeout=20)
mm2_installer.wait_for_installs(timeout=20) if model_params["type"] != "embedding":
if model_params["type"] != "embedding": assert install_job1.errored
assert install_job1.errored assert install_job1.error_type == "InvalidModelConfigException"
assert install_job1.error_type == "InvalidModelConfigException" return
return assert install_job1.complete
assert install_job1.complete assert install_job1.config_out if model_params["type"] == "embedding" else not install_job1.config_out
assert install_job1.config_out if model_params["type"] == "embedding" else not install_job1.config_out
install_job2 = mm2_installer.heuristic_import(source=model_params["repo_id"], config=config2) install_job2 = mm2_installer.heuristic_import(source=model_params["repo_id"], config=config2)
mm2_installer.wait_for_installs(timeout=20) mm2_installer.wait_for_job(install_job2, timeout=20)
assert install_job2.complete assert install_job2.complete
assert install_job2.config_out if model_params["type"] == "embedding" else not install_job2.config_out assert install_job2.config_out if model_params["type"] == "embedding" else not install_job2.config_out
except InvalidModelConfigException:
assert model_params["type"] != "embedding"