Skip to content

Commit 158c53c

Browse files
committed
Fix unit tests + linter issues
1 parent 2f9b4ee commit 158c53c

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

docker/mongodb-kubernetes-tests/kubetester/__init__.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,12 @@ def delete_namespace(name: str):
273273
c = client.CoreV1Api()
274274
c.delete_namespace(name, body=c.V1DeleteOptions())
275275

276+
276277
def label_namespace(name: str, labels: dict):
277-
body = {
278-
"metadata": {
279-
"labels": labels
280-
}
281-
}
278+
body = {"metadata": {"labels": labels}}
282279
client.CoreV1Api().patch_namespace(name, body)
283280

281+
284282
def get_deployments(namespace: str):
285283
return client.AppsV1Api().list_namespaced_deployment(namespace)
286284

docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_sharded_cluster.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
from kubetester import (
66
create_or_update_secret,
77
get_default_storage_class,
8+
label_namespace,
89
try_load,
9-
wait_until, create_or_update_namespace, label_namespace,
10+
wait_until,
1011
)
1112
from kubetester.awss3client import AwsS3Client
1213
from kubetester.kubetester import KubernetesTester, ensure_ent_version
@@ -54,10 +55,9 @@ def ops_manager(
5455
)
5556

5657
# Change pod-security mode from warn to enforce. This will make test fail if operator and deployments don't support enforce mode
57-
label_namespace(namespace, {
58-
"pod-security.kubernetes.io/enforce": None,
59-
"pod-security.kubernetes.io/warn": "restricted"
60-
})
58+
label_namespace(
59+
namespace, {"pod-security.kubernetes.io/enforce": None, "pod-security.kubernetes.io/warn": "restricted"}
60+
)
6161

6262
try_load(resource)
6363
return resource
@@ -241,7 +241,7 @@ def test_om_failed_oplog_no_user_ref(self, ops_manager: MongoDBOpsManager):
241241
ops_manager.backup_status().assert_reaches_phase(
242242
Phase.Failed,
243243
msg_regexp=".*is configured to use SCRAM-SHA authentication mode, the user "
244-
"must be specified using 'mongodbUserRef'",
244+
"must be specified using 'mongodbUserRef'",
245245
)
246246

247247
def test_fix_om(self, ops_manager: MongoDBOpsManager, oplog_user: MongoDBUser):

mongodb-community-operator/pkg/kube/podtemplatespec/podspec_template_test.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"testing"
55

66
"github.com/stretchr/testify/assert"
7-
"k8s.io/utils/ptr"
87

98
corev1 "k8s.io/api/core/v1"
109
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -442,12 +441,6 @@ func TestMergeContainer(t *testing.T) {
442441
},
443442
},
444443
ReadinessProbe: otherDefaultContainer.ReadinessProbe,
445-
SecurityContext: &corev1.SecurityContext{
446-
AllowPrivilegeEscalation: ptr.To(false),
447-
Capabilities: &corev1.Capabilities{
448-
Drop: []corev1.Capability{"ALL"},
449-
},
450-
},
451444
}
452445
assert.Equal(t, secondExpected, mergedSpec.Spec.Containers[2])
453446
}

0 commit comments

Comments
 (0)