Skip to content

Commit 2d63d96

Browse files
committed
fix tests
1 parent 00e69f5 commit 2d63d96

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

internal/integration/client_side_encryption_prose_test.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,11 +1637,11 @@ func TestClientSideEncryptionProse(t *testing.T) {
16371637
_, err = cpt.clientEnc.CreateDataKey(context.Background(), tc.name, dkOpts)
16381638
// check if current test case is KMIP, which should pass
16391639
if tc.name == "kmip" {
1640-
assert.Nil(mt, err, "expected no error, got err: %v", err)
1640+
assert.Nil(mt, err, "expected no error, got err: %v, %s", err, tlsClientCertificateKeyFileKMIP)
16411641
} else {
16421642
assert.NotNil(mt, err, "expected error, got nil")
16431643
assert.True(mt, strings.Contains(err.Error(), tc.tlsError),
1644-
"expected error '%s' to contain '%s'", err.Error(), tc.tlsError)
1644+
"expected error '%s' to contain '%s', %s", err.Error(), tc.tlsError, tlsClientCertificateKeyFileKMIP)
16451645
}
16461646

16471647
// call CreateDataKey with expired CEO each provider and same masterKey
@@ -2988,8 +2988,16 @@ func TestClientSideEncryptionProse(t *testing.T) {
29882988
mt.Skipf("Skipping test as KMS_FAILPOINT_SERVERS_RUNNING is not set")
29892989
}
29902990

2991-
tlsCfg := &tls.Config{
2992-
InsecureSkipVerify: true,
2991+
mt.Parallel()
2992+
2993+
var tlsCfg *tls.Config
2994+
if tlsCAFileKMIP != "" {
2995+
var err error
2996+
clientAndCATlsMap := map[string]interface{}{
2997+
"tlsCAFile": tlsCAFileKMIP,
2998+
}
2999+
tlsCfg, err = options.BuildTLSConfig(clientAndCATlsMap)
3000+
require.Nil(mt, err, "BuildTLSConfig error: %v", err)
29933001
}
29943002

29953003
setFailPoint := func(failure string, count int) error {
@@ -3023,7 +3031,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
30233031
require.NoError(mt, err, "error on NewClientEncryption: %v", err)
30243032

30253033
err = setFailPoint("network", 1)
3026-
require.NoError(mt, err, "mock server error: %v", err)
3034+
require.NoError(mt, err, "mock server error: %v, %s", err, tlsCAFileKMIP)
30273035

30283036
dkOpts := options.DataKey().SetMasterKey(
30293037
bson.D{

0 commit comments

Comments
 (0)