Skip to content
This repository was archived by the owner on Mar 13, 2022. It is now read-only.

Commit b08556b

Browse files
committed
change test case
1 parent 3ff79da commit b08556b

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

Diff for: config/kube_config_test.py

+25-2
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ def test__get_kube_config_loader_for_yaml_file_persist(self):
13421342
actual = _get_kube_config_loader_for_yaml_file(config_file,
13431343
persist_config=True)
13441344
self.assertTrue(callable(actual._config_persister))
1345-
self.assertEquals(actual._config_persister.__name__, "save_changes")
1345+
self.assertEqual(actual._config_persister.__name__, "save_changes")
13461346

13471347

13481348
class TestKubernetesClientConfiguration(BaseTestCase):
@@ -1517,6 +1517,28 @@ class TestKubeConfigMerger(BaseTestCase):
15171517
}
15181518
]
15191519
}
1520+
#this PR https://github.com/kubernetes/kubernetes/pull/84503 changed the behaviour of kubectl,
1521+
#If there is no users, the users field will be set to None.
1522+
TEST_KUBE_CONFIG_PART6 = {
1523+
"current-context": "no_user",
1524+
"contexts": [
1525+
{
1526+
"name": "no_user",
1527+
"context": {
1528+
"cluster": "default"
1529+
}
1530+
},
1531+
],
1532+
"clusters": [
1533+
{
1534+
"name": "default",
1535+
"cluster": {
1536+
"server": TEST_HOST
1537+
}
1538+
},
1539+
],
1540+
"users": None
1541+
}
15201542

15211543
def _create_multi_config(self):
15221544
files = []
@@ -1525,7 +1547,8 @@ def _create_multi_config(self):
15251547
self.TEST_KUBE_CONFIG_PART2,
15261548
self.TEST_KUBE_CONFIG_PART3,
15271549
self.TEST_KUBE_CONFIG_PART4,
1528-
self.TEST_KUBE_CONFIG_PART5):
1550+
self.TEST_KUBE_CONFIG_PART5,
1551+
self.TEST_KUBE_CONFIG_PART6):
15291552
files.append(self._create_temp_file(yaml.safe_dump(part)))
15301553
return ENV_KUBECONFIG_PATH_SEPARATOR.join(files)
15311554

0 commit comments

Comments
 (0)