Skip to content

Commit f7a1073

Browse files
committed
Update tests which assume order of env variables
1 parent 266153d commit f7a1073

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

src/confcom/azext_confcom/tests/latest/test_confcom_arm.py

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,8 +1618,8 @@ def test_incorrect_policy_diff(self):
16181618
"no_new_privileges": [{"tested_value": True, "policy_value": False}]
16191619
},
16201620
"env_rules": [
1621-
"environment variable with rule 'TEST_REGEXP_ENV=test_regexp_en' does not match strings or regex in policy rules",
16221621
"environment variable with rule 'ENV_VALUE=input_value' does not match strings or regex in policy rules",
1622+
"environment variable with rule 'TEST_REGEXP_ENV=test_regexp_en' does not match strings or regex in policy rules",
16231623
],
16241624
}
16251625
}
@@ -3611,18 +3611,17 @@ def test_wildcard_env_var(self):
36113611
)
36123612
)
36133613

3614-
self.assertEqual(
3615-
normalized_aci_arm_policy[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS][1][
3616-
config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_STRATEGY
3617-
],
3618-
"re2",
3614+
test_env_var = next(
3615+
env_var
3616+
for env_var in normalized_aci_arm_policy[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS]
3617+
if env_var[config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE] == "TEST_WILDCARD_ENV=.*"
36193618
)
36203619

3620+
self.assertIsNotNone(test_env_var)
3621+
36213622
self.assertEqual(
3622-
normalized_aci_arm_policy[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS][1][
3623-
config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE
3624-
],
3625-
"TEST_WILDCARD_ENV=.*",
3623+
test_env_var[config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_STRATEGY],
3624+
"re2",
36263625
)
36273626

36283627
normalized_aci_arm_policy2 = json.loads(
@@ -3635,13 +3634,14 @@ def test_wildcard_env_var(self):
36353634
any([item.get("name") == "WILDCARD2" for item in normalized_aci_arm_policy2[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS]])
36363635
)
36373636

3638-
self.assertEqual(
3639-
normalized_aci_arm_policy2[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS][1][
3640-
config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE
3641-
],
3642-
"TEST_WILDCARD_ENV=.*",
3637+
test_env_var = next(
3638+
env_var
3639+
for env_var in normalized_aci_arm_policy2[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS]
3640+
if env_var[config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE] == "TEST_WILDCARD_ENV=.*"
36433641
)
36443642

3643+
self.assertIsNotNone(test_env_var)
3644+
36453645
def test_wildcard_env_var_invalid(self):
36463646
with self.assertRaises(SystemExit) as wrapped_exit:
36473647
load_policy_from_arm_template_str(self.custom_arm_json_error, "")
@@ -3800,10 +3800,15 @@ def test_arm_template_with_env_var(self):
38003800
)
38013801
)
38023802

3803-
env_var = regular_image_json[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS][0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE]
3803+
env_var = next(
3804+
env_var[config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE]
3805+
for env_var in regular_image_json[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS]
3806+
if env_var[config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE] == "PORT=parameters('abc')"
3807+
)
3808+
3809+
self.assertIsNotNone(env_var)
38043810

38053811
# see if the remote image and the local one produce the same output
3806-
self.assertEqual(env_var, "PORT=parameters('abc')")
38073812
self.assertEqual(regular_image_json[0][config.POLICY_FIELD_CONTAINERS_ID], "mcr.microsoft.com/azurelinux/distroless/base:3.0")
38083813

38093814
def test_arm_template_config_map_sidecar(self):

0 commit comments

Comments
 (0)