Skip to content

Commit 47f635e

Browse files
msotheeswaran-scGitHub Enterprise
authored andcommitted
Fix tls auditlog tests and enable tls for CI (#234)
* fix auditlog test titles, and enable tls tests for CI * fix tls auditlog key string
1 parent cd42776 commit 47f635e

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ machamp:
2121
parent: make-build
2222
# https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
2323
builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
24-
command: ./runtest --clients 4 --verbose
24+
command: ./runtest --clients 4 --verbose --tls
2525
cluster-test:
2626
type: cmd
2727
parent: make-build
2828
# https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
2929
builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
30-
command: ./runtest-cluster
30+
command: ./runtest-cluster --tls
3131
sentinel-test:
3232
type: cmd
3333
parent: make-build

src/server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5102,8 +5102,8 @@ int processCommand(client *c, int callFlags) {
51025102

51035103
sds str = sdsempty();
51045104
for (int j = 0; j < numkeys; j++) {
5105-
sdscatsds(str, (sds)ptrFromObj(c->argv[keyindex[j]]));
5106-
sdscat(str, " ");
5105+
str = sdscatsds(str, (sds)ptrFromObj(c->argv[keyindex[j]]));
5106+
str = sdscat(str, " ");
51075107
}
51085108

51095109
if (numkeys > 0)

tests/unit/tls-auditlog.tcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if {$::tls} {
5151
}
5252
}
5353

54-
test {TLS: Able to connect while with SAN having a comprehensive list} {
54+
test {TLS Audit Log: Able to connect while with SAN having a comprehensive list} {
5555
start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.keydb.dev san2.keydb.dev other.keydb.dev}}} {
5656
catch {r PING} e
5757
assert_match {PONG} $e
@@ -65,7 +65,7 @@ if {$::tls} {
6565
}
6666
}
6767

68-
test {TLS Audit LogTLS: Able to connect while with SAN having a comprehensive list with wildcards} {
68+
test {TLS Audit Log: Able to connect while with SAN having a comprehensive list with wildcards} {
6969
start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.* san*.dev other.*}}} {
7070
catch {r PING} e
7171
assert_match {PONG} $e

0 commit comments

Comments
 (0)