Fix windows test (#13811)

This commit is contained in:
Ameer Haj Ali
2021-01-30 07:10:59 +02:00
committed by GitHub
parent 4b60c388ef
commit 660857ffab
2 changed files with 36 additions and 2 deletions
+8
View File
@@ -86,6 +86,14 @@ def validate_config(config: Dict[str, Any]) -> None:
raise ValueError(
"`head_node_type` must be one of `available_node_types`.")
sum_min_workers = sum(
config["available_node_types"][node_type].get("min_workers", 0)
for node_type in config["available_node_types"])
if sum_min_workers > config["max_workers"]:
raise ValueError(
"The specified global `max_workers` is smaller than the "
"sum of `min_workers` of all the available node types.")
def prepare_config(config):
with_defaults = fillout_defaults(config)
+28 -2
View File
@@ -46,8 +46,34 @@ class AutoscalingConfigTest(unittest.TestCase):
self.fail("Config did not pass validation test!")
@pytest.mark.skipif(
sys.platform.startswith("win"),
reason="TODO(ameer): fails on Windows.")
sys.platform.startswith("win"), reason="Fails on Windows.")
def testValidateDefaultConfigMinMaxWorkers(self):
aws_config_path = os.path.join(
RAY_PATH, "autoscaler/aws/example-multi-node-type.yaml")
with open(aws_config_path) as f:
config = yaml.safe_load(f)
config = prepare_config(config)
for node_type in config["available_node_types"]:
config["available_node_types"][node_type]["resources"] = config[
"available_node_types"][node_type].get("resources", {})
try:
validate_config(config)
except Exception:
self.fail("Config did not pass validation test!")
config["max_workers"] = 0 # the sum of min_workers is 1.
with pytest.raises(ValueError):
validate_config(config)
# make sure edge case of exactly 1 passes too.
config["max_workers"] = 1
try:
validate_config(config)
except Exception:
self.fail("Config did not pass validation test!")
@pytest.mark.skipif(
sys.platform.startswith("win"), reason="Fails on Windows.")
def testValidateDefaultConfigAWSMultiNodeTypes(self):
aws_config_path = os.path.join(
RAY_PATH, "autoscaler/aws/example-multi-node-type.yaml")