Skip to content

Commit 66317ed

Browse files
authored
DRIVERS-3416: deduplicate test names in client-backpressure retryability tests (#1910)
1 parent 5711e4b commit 66317ed

6 files changed

Lines changed: 14 additions & 14 deletions

source/client-backpressure/tests/backpressure-retry-loop.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@
711711
]
712712
},
713713
{
714-
"description": "database.aggregate retries using operation loop",
714+
"description": "database.aggregate read retries using operation loop",
715715
"operations": [
716716
{
717717
"name": "failPoint",
@@ -1480,7 +1480,7 @@
14801480
]
14811481
},
14821482
{
1483-
"description": "collection.aggregate retries using operation loop",
1483+
"description": "collection.aggregate read retries using operation loop",
14841484
"operations": [
14851485
{
14861486
"name": "failPoint",
@@ -4734,7 +4734,7 @@
47344734
]
47354735
},
47364736
{
4737-
"description": "collection.aggregate retries using operation loop",
4737+
"description": "collection.aggregate write retries using operation loop",
47384738
"operations": [
47394739
{
47404740
"name": "failPoint",

source/client-backpressure/tests/backpressure-retry-loop.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ tests:
366366
commandName: bulkWrite
367367

368368

369-
- description: 'database.aggregate retries using operation loop'
369+
- description: 'database.aggregate read retries using operation loop'
370370
operations:
371371
- name: failPoint
372372
object: testRunner
@@ -743,7 +743,7 @@ tests:
743743
commandName: aggregate
744744

745745

746-
- description: 'collection.aggregate retries using operation loop'
746+
- description: 'collection.aggregate read retries using operation loop'
747747
operations:
748748
- name: failPoint
749749
object: testRunner
@@ -2344,7 +2344,7 @@ tests:
23442344
commandName: dropIndexes
23452345

23462346

2347-
- description: 'collection.aggregate retries using operation loop'
2347+
- description: 'collection.aggregate write retries using operation loop'
23482348
operations:
23492349
- name: failPoint
23502350
object: testRunner

source/client-backpressure/tests/backpressure-retry-loop.yml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ _yamlAnchors:
8484
bulWriteInsertNamespace: &client_bulk_write_ns retryable-writes-tests.coll
8585

8686
tests: {% for operation in operations %}
87-
- description: '{{operation.object}}.{{operation.operation_name}} retries using operation loop' {%- if ((operation.operation_name == 'clientBulkWrite')) %}
87+
- description: '{{operation.object}}.{{operation.operation_name}}{{ " " + operation.operation_type + "" if operation.operation_name == "aggregate" else "" }} retries using operation loop' {%- if ((operation.operation_name == 'clientBulkWrite')) %}
8888
runOnRequirements:
8989
- minServerVersion: '8.0' # client bulk write added to server in 8.0
9090
{%- endif %}

source/client-backpressure/tests/backpressure-retry-max-attempts.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@
496496
]
497497
},
498498
{
499-
"description": "database.aggregate retries at most maxAttempts=5 times",
499+
"description": "database.aggregate read retries at most maxAttempts=5 times",
500500
"operations": [
501501
{
502502
"name": "failPoint",
@@ -1026,7 +1026,7 @@
10261026
]
10271027
},
10281028
{
1029-
"description": "collection.aggregate retries at most maxAttempts=5 times",
1029+
"description": "collection.aggregate read retries at most maxAttempts=5 times",
10301030
"operations": [
10311031
{
10321032
"name": "failPoint",
@@ -3448,7 +3448,7 @@
34483448
]
34493449
},
34503450
{
3451-
"description": "collection.aggregate retries at most maxAttempts=5 times",
3451+
"description": "collection.aggregate write retries at most maxAttempts=5 times",
34523452
"operations": [
34533453
{
34543454
"name": "failPoint",

source/client-backpressure/tests/backpressure-retry-max-attempts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ tests:
252252
- commandFailedEvent:
253253
commandName: bulkWrite
254254

255-
- description: 'database.aggregate retries at most maxAttempts=5 times'
255+
- description: 'database.aggregate read retries at most maxAttempts=5 times'
256256
operations:
257257
- name: failPoint
258258
object: testRunner
@@ -513,7 +513,7 @@ tests:
513513
- commandFailedEvent:
514514
commandName: aggregate
515515

516-
- description: 'collection.aggregate retries at most maxAttempts=5 times'
516+
- description: 'collection.aggregate read retries at most maxAttempts=5 times'
517517
operations:
518518
- name: failPoint
519519
object: testRunner
@@ -1711,7 +1711,7 @@ tests:
17111711
- commandFailedEvent:
17121712
commandName: dropIndexes
17131713

1714-
- description: 'collection.aggregate retries at most maxAttempts=5 times'
1714+
- description: 'collection.aggregate write retries at most maxAttempts=5 times'
17151715
operations:
17161716
- name: failPoint
17171717
object: testRunner

source/client-backpressure/tests/backpressure-retry-max-attempts.yml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ initialData:
4141
- { _id: 2, x: 22 }
4242

4343
tests: {% for operation in operations %}
44-
- description: '{{operation.object}}.{{operation.operation_name}} retries at most maxAttempts=5 times'
44+
- description: '{{operation.object}}.{{operation.operation_name}}{{ " " + operation.operation_type + "" if operation.operation_name == "aggregate" else "" }} retries at most maxAttempts=5 times'
4545
{%- if ((operation.operation_name == 'clientBulkWrite')) %}
4646
runOnRequirements:
4747
- minServerVersion: '8.0' # client bulk write added to server in 8.0

0 commit comments

Comments
 (0)