Skip to content

Commit 83281f6

Browse files
comandeo-mongocomandeo-mongo
committed
Merge remote-tracking branch 'upstream/master' into 2832-jruby-fle
2 parents 9a126ea + 8faaee3 commit 83281f6

17 files changed

+46
-27
lines changed

‎.github/workflows/test.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,23 @@ jobs:
6262
bundler: 2
6363
- name: bundle
6464
run: bundle install --jobs 4 --retry 3
65+
- name: prepare test suite
66+
run: bundle exec rake spec:prepare
67+
env:
68+
MONGODB_URI: ${{ steps.start-mongodb.outputs.cluster-uri }}
69+
- name: prepare replica set
70+
run: ruby -Ilib -I.evergreen/lib -rbundler/setup -rserver_setup -e ServerSetup.new.setup_tags
71+
if: ${{ matrix.topology == 'replica_set' }}
72+
env:
73+
MONGODB_URI: ${{ steps.start-mongodb.outputs.cluster-uri }}
74+
- name: wait for sessions
75+
run: bundle exec rake spec:wait_for_sessions
76+
if: ${{ matrix.topology == 'sharded_cluster' && matrix.mongodb == '3.6' }}
77+
env:
78+
MONGODB_URI: ${{ steps.start-mongodb.outputs.cluster-uri }}
6579
- name: test
6680
timeout-minutes: 60
67-
continue-on-error: true
81+
continue-on-error: false
6882
run: bundle exec rake spec:ci
6983
env:
7084
MONGODB_URI: ${{ steps.start-mongodb.outputs.cluster-uri }}

‎spec/integration/versioned_api_examples_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
# the tests to simple configurations
1010
require_no_auth
1111
require_no_tls
12+
min_server_version("5.0")
1213

1314
let(:uri_string) do
14-
"mongodb://#{SpecConfig.instance.addresses.join(',')}"
15+
"mongodb://#{SpecConfig.instance.addresses.join(',')}/versioned-api-examples"
1516
end
1617

1718
it 'Versioned API example 1' do

‎spec/shared

‎spec/spec_tests/data/retryable_writes/bulkWrite-serverErrors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ tests:
5858
mode: { times: 1 }
5959
data:
6060
failCommands: ["insert"]
61+
errorLabels: ["RetryableWriteError"]
6162
writeConcernError:
6263
code: 91
6364
errmsg: Replication is being shut down
64-
errorLabels: ["RetryableWriteError"]
6565
operation:
6666
name: "bulkWrite"
6767
arguments:

‎spec/spec_tests/data/retryable_writes/deleteOne-serverErrors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ tests:
3737
mode: { times: 1 }
3838
data:
3939
failCommands: ["delete"]
40+
errorLabels: ["RetryableWriteError"]
4041
writeConcernError:
4142
code: 91
4243
errmsg: Replication is being shut down
43-
errorLabels: ["RetryableWriteError"]
4444
operation:
4545
name: "deleteOne"
4646
arguments:

‎spec/spec_tests/data/retryable_writes/findOneAndDelete-serverErrors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ tests:
3737
mode: { times: 1 }
3838
data:
3939
failCommands: ["findAndModify"]
40+
errorLabels: ["RetryableWriteError"]
4041
writeConcernError:
4142
code: 91
4243
errmsg: Replication is being shut down
43-
errorLabels: ["RetryableWriteError"]
4444
operation:
4545
name: "findOneAndDelete"
4646
arguments:

‎spec/spec_tests/data/retryable_writes/findOneAndReplace-serverErrors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ tests:
3939
mode: { times: 1 }
4040
data:
4141
failCommands: ["findAndModify"]
42+
errorLabels: ["RetryableWriteError"]
4243
writeConcernError:
4344
code: 91
4445
errmsg: Replication is being shut down
45-
errorLabels: ["RetryableWriteError"]
4646
operation:
4747
name: "findOneAndReplace"
4848
arguments:

‎spec/spec_tests/data/retryable_writes/findOneAndUpdate-serverErrors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ tests:
3939
mode: { times: 1 }
4040
data:
4141
failCommands: ["findAndModify"]
42+
errorLabels: ["RetryableWriteError"]
4243
writeConcernError:
4344
code: 91
4445
errmsg: Replication is being shut down
45-
errorLabels: ["RetryableWriteError"]
4646
operation:
4747
name: "findOneAndUpdate"
4848
arguments:

‎spec/spec_tests/data/retryable_writes/insertMany-serverErrors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ tests:
4141
mode: { times: 1 }
4242
data:
4343
failCommands: ["insert"]
44+
errorLabels: ["RetryableWriteError"]
4445
writeConcernError:
4546
code: 91
4647
errmsg: Replication is being shut down
47-
errorLabels: ["RetryableWriteError"]
4848
operation:
4949
name: "insertMany"
5050
arguments:

‎spec/spec_tests/data/retryable_writes/insertOne-serverErrors.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,10 @@ tests:
347347
mode: { times: 1 }
348348
data:
349349
failCommands: ["insert"]
350+
errorLabels: ["RetryableWriteError"]
350351
writeConcernError:
351352
code: 11600
352353
errmsg: Replication is being shut down
353-
errorLabels: ["RetryableWriteError"]
354354
operation:
355355
name: "insertOne"
356356
arguments:
@@ -370,10 +370,10 @@ tests:
370370
mode: { times: 1 }
371371
data:
372372
failCommands: ["insert"]
373+
errorLabels: ["RetryableWriteError"]
373374
writeConcernError:
374375
code: 11602
375376
errmsg: Replication is being shut down
376-
errorLabels: ["RetryableWriteError"]
377377
operation:
378378
name: "insertOne"
379379
arguments:
@@ -393,10 +393,10 @@ tests:
393393
mode: { times: 1 }
394394
data:
395395
failCommands: ["insert"]
396+
errorLabels: ["RetryableWriteError"]
396397
writeConcernError:
397398
code: 189
398399
errmsg: Replication is being shut down
399-
errorLabels: ["RetryableWriteError"]
400400
operation:
401401
name: "insertOne"
402402
arguments:
@@ -416,10 +416,10 @@ tests:
416416
mode: { times: 1 }
417417
data:
418418
failCommands: ["insert"]
419+
errorLabels: ["RetryableWriteError"]
419420
writeConcernError:
420421
code: 91
421422
errmsg: Replication is being shut down
422-
errorLabels: ["RetryableWriteError"]
423423
operation:
424424
name: "insertOne"
425425
arguments:
@@ -439,10 +439,10 @@ tests:
439439
mode: { times: 2 }
440440
data:
441441
failCommands: ["insert"]
442+
errorLabels: ["RetryableWriteError"]
442443
writeConcernError:
443444
code: 91
444445
errmsg: Replication is being shut down
445-
errorLabels: ["RetryableWriteError"]
446446
operation:
447447
name: "insertOne"
448448
arguments:

‎spec/spec_tests/data/retryable_writes/replaceOne-serverErrors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ tests:
4141
mode: { times: 1 }
4242
data:
4343
failCommands: ["update"]
44+
errorLabels: ["RetryableWriteError"]
4445
writeConcernError:
4546
code: 91
4647
errmsg: Replication is being shut down
47-
errorLabels: ["RetryableWriteError"]
4848
operation:
4949
name: "replaceOne"
5050
arguments:

‎spec/spec_tests/data/retryable_writes/updateOne-serverErrors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ tests:
4141
mode: { times: 1 }
4242
data:
4343
failCommands: ["update"]
44+
errorLabels: ["RetryableWriteError"]
4445
writeConcernError:
4546
code: 91
4647
errmsg: Replication is being shut down
47-
errorLabels: ["RetryableWriteError"]
4848
operation:
4949
name: "updateOne"
5050
arguments:

‎spec/spec_tests/data/transactions/error-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,10 +590,10 @@ tests:
590590
mode: { times: 2 }
591591
data:
592592
failCommands: ["commitTransaction"]
593+
errorLabels: ["RetryableWriteError"]
593594
writeConcernError:
594595
code: 91
595596
errmsg: Replication is being shut down
596-
errorLabels: ["RetryableWriteError"]
597597

598598
operations:
599599
- name: startTransaction

‎spec/spec_tests/data/transactions/mongos-recovery-token.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ tests:
118118
mode: { times: 1 }
119119
data:
120120
failCommands: ["commitTransaction"]
121+
errorLabels: ["RetryableWriteError"]
121122
writeConcernError:
122123
code: 91
123124
errmsg: Replication is being shut down
124-
errorLabels: ["RetryableWriteError"]
125125
# The client sees a retryable writeConcernError on the first
126126
# commitTransaction due to the fail point but it actually succeeds on the
127127
# server (SERVER-39346). The retry will succeed both on a new mongos and

‎spec/spec_tests/data/transactions/retryable-abort.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,9 +1023,9 @@ tests:
10231023
mode: { times: 1 }
10241024
data:
10251025
failCommands: ["abortTransaction"]
1026+
errorLabels: ["RetryableWriteError"]
10261027
writeConcernError:
10271028
code: 11600
1028-
errorLabels: ["RetryableWriteError"]
10291029
errmsg: Replication is being shut down
10301030

10311031
operations:
@@ -1098,9 +1098,9 @@ tests:
10981098
mode: { times: 1 }
10991099
data:
11001100
failCommands: ["abortTransaction"]
1101+
errorLabels: ["RetryableWriteError"]
11011102
writeConcernError:
11021103
code: 11602
1103-
errorLabels: ["RetryableWriteError"]
11041104
errmsg: Replication is being shut down
11051105

11061106
operations:
@@ -1173,9 +1173,9 @@ tests:
11731173
mode: { times: 1 }
11741174
data:
11751175
failCommands: ["abortTransaction"]
1176+
errorLabels: ["RetryableWriteError"]
11761177
writeConcernError:
11771178
code: 189
1178-
errorLabels: ["RetryableWriteError"]
11791179
errmsg: Replication is being shut down
11801180

11811181
operations:
@@ -1248,9 +1248,9 @@ tests:
12481248
mode: { times: 1 }
12491249
data:
12501250
failCommands: ["abortTransaction"]
1251+
errorLabels: ["RetryableWriteError"]
12511252
writeConcernError:
12521253
code: 91
1253-
errorLabels: ["RetryableWriteError"]
12541254
errmsg: Replication is being shut down
12551255

12561256
operations:

‎spec/spec_tests/data/transactions/retryable-commit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,9 +1164,9 @@ tests:
11641164
mode: { times: 1 }
11651165
data:
11661166
failCommands: ["commitTransaction"]
1167+
errorLabels: ["RetryableWriteError"]
11671168
writeConcernError:
11681169
code: 11600
1169-
errorLabels: ["RetryableWriteError"]
11701170
errmsg: Replication is being shut down
11711171

11721172
operations:
@@ -1240,9 +1240,9 @@ tests:
12401240
mode: { times: 1 }
12411241
data:
12421242
failCommands: ["commitTransaction"]
1243+
errorLabels: ["RetryableWriteError"]
12431244
writeConcernError:
12441245
code: 11602
1245-
errorLabels: ["RetryableWriteError"]
12461246
errmsg: Replication is being shut down
12471247

12481248
operations:
@@ -1316,9 +1316,9 @@ tests:
13161316
mode: { times: 1 }
13171317
data:
13181318
failCommands: ["commitTransaction"]
1319+
errorLabels: ["RetryableWriteError"]
13191320
writeConcernError:
13201321
code: 189
1321-
errorLabels: ["RetryableWriteError"]
13221322
errmsg: Replication is being shut down
13231323

13241324
operations:
@@ -1392,9 +1392,9 @@ tests:
13921392
mode: { times: 1 }
13931393
data:
13941394
failCommands: ["commitTransaction"]
1395+
errorLabels: ["RetryableWriteError"]
13951396
writeConcernError:
13961397
code: 91
1397-
errorLabels: ["RetryableWriteError"]
13981398
errmsg: Replication is being shut down
13991399

14001400
operations:

‎spec/support/spec_config.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,11 @@ def client_cert_path
296296
end
297297

298298
def local_client_pem_path
299-
"#{ssl_certs_dir}/client.pem"
299+
if (algo = ENV['OCSP_ALGORITHM'])&.empty?
300+
"#{ssl_certs_dir}/client.pem"
301+
else
302+
Pathname.new("#{spec_root}/support/ocsp/#{algo}/server.pem")
303+
end
300304
end
301305

302306
def client_pem_path

0 commit comments

Comments
 (0)