Skip to content
Snippets Groups Projects
Commit c9db2606 authored by Yas Naoi's avatar Yas Naoi
Browse files

Issue #3222920 by yas, sekinet, baldwinlouie: Fix a test case error at...

Issue #3222920 by yas, sekinet, baldwinlouie: Fix a test case error at K8sRoleBindingTest::testUpdateAllRoleBindingList()
parent e3acf746
No related branches found
No related tags found
No related merge requests found
......@@ -93,7 +93,7 @@ class K8sRoleBindingTest extends K8sTestBase {
$edit = $this->createRoleBindingTestFormData(self::K8S_ROLE_BINDING_REPEAT_COUNT, $this->namespace);
for ($i = 0, $num = 1; $i < self::K8S_ROLE_BINDING_REPEAT_COUNT; $i++, $num++) {
$this->updateRoleBindingMockData($edit[$i]);
$this->updateRoleBindingMockData($edit[$i], $cloud_context, $this->webUser->id());
unset($edit[$i]['post_data']['namespace']);
$this->drupalGet("/clouds/k8s/$cloud_context/role_binding/$num/edit");
......@@ -205,10 +205,11 @@ class K8sRoleBindingTest extends K8sTestBase {
// Edit a Role Binding.
foreach ($cloud_configs ?: [] as $cloud_config) {
$cloud_context = $cloud_config->getCloudContext();
$edit = $this->createRoleBindingTestFormData(self::K8S_ROLE_BINDING_REPEAT_COUNT, $this->namespace);
for ($i = 0, $num = 1; $i < self::K8S_ROLE_BINDING_REPEAT_COUNT; $i++, $num++) {
$this->updateRoleBindingMockData($edit[$i]);
$this->updateRoleBindingMockData($edit[$i], $cloud_context, $this->webUser->id());
// Change Role Binding Name in mock data.
$add[$i]['name'] = "name-{$this->random->name(8, TRUE)}";
......
......@@ -2648,8 +2648,12 @@ trait K8sTestMockTrait {
*
* @param array $role_binding
* The role mock data.
* @param string $cloud_context
* The cloud context.
* @param int $uid
* The user ID.
*/
protected function updateRoleBindingMockData(array $role_binding): void {
protected function updateRoleBindingMockData(array $role_binding, $cloud_context, $uid): void {
$mock_data = $this->getMockDataFromConfig();
$update_role_binding = [
......@@ -2657,6 +2661,12 @@ trait K8sTestMockTrait {
'name' => $role_binding['name'],
'namespace' => $role_binding['post_data']['namespace'],
'creationTimestamp' => date('Y/m/d H:i:s'),
'annotations' => [
\Drupal::service('cloud')->getTagCreatedByUid(
'k8s',
$cloud_context
) => $uid,
],
],
'subjects' => [
'name' => 'tiller',
......@@ -2665,7 +2675,6 @@ trait K8sTestMockTrait {
'roleRef' => [
'name' => 'system:controller:route-controller',
],
];
$mock_data['updateRoleBinding'] = $update_role_binding;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment