Skip to content

Commit

Permalink
MONGOID-5130 Disable Clients::Options#with test (mongodb#5018)
Browse files Browse the repository at this point in the history
  • Loading branch information
comandeo-mongo committed Jul 30, 2021
1 parent 9835f13 commit 2f3505c
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 59 deletions.
124 changes: 65 additions & 59 deletions .evergreen/config.yml
Expand Up @@ -438,9 +438,10 @@ axes:
- id: "os"
display_name: OS
values:
- id: ubuntu-14.04
display_name: "Ubuntu 14.04"
run_on: ubuntu1404-small
# https://jira.mongodb.org/browse/MONGOID-5133
# - id: ubuntu-14.04
# display_name: "Ubuntu 14.04"
# run_on: ubuntu1404-small
- id: ubuntu-16.04
display_name: "Ubuntu 16.04"
run_on: ubuntu1604-small
Expand Down Expand Up @@ -588,17 +589,18 @@ buildvariants:
- ubuntu1804-small
tasks:
- name: "test"
- matrix_name: "topologies-old"
matrix_spec:
driver: current
ruby: "ruby-2.6"
mongodb-version: ['2.6', '3.0', '3.2', '3.4']
topology: ["replica-set", "sharded-cluster"]
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
run_on:
- ubuntu1404-small
tasks:
- name: "test"
# https://jira.mongodb.org/browse/MONGOID-5133
# - matrix_name: "topologies-old"
# matrix_spec:
# driver: current
# ruby: "ruby-2.6"
# mongodb-version: ['2.6', '3.0', '3.2', '3.4']
# topology: ["replica-set", "sharded-cluster"]
# display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
# run_on:
# - ubuntu1404-small
# tasks:
# - name: "test"
- matrix_name: "mongodb"
matrix_spec:
driver: "current"
Expand All @@ -610,17 +612,18 @@ buildvariants:
- rhel70-small
tasks:
- name: "test"
- matrix_name: "mongodb-old"
matrix_spec:
driver: "current"
ruby: "ruby-2.5"
mongodb-version: ["3.0", "2.6"]
topology: "standalone"
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
run_on:
- ubuntu1404-small
tasks:
- name: "test"
# https://jira.mongodb.org/browse/MONGOID-5133
# - matrix_name: "mongodb-old"
# matrix_spec:
# driver: "current"
# ruby: "ruby-2.5"
# mongodb-version: ["3.0", "2.6"]
# topology: "standalone"
# display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
# run_on:
# - ubuntu1404-small
# tasks:
# - name: "test"
- matrix_name: "jruby-new"
matrix_spec:
driver: "current"
Expand Down Expand Up @@ -665,17 +668,18 @@ buildvariants:
- rhel70-small
tasks:
- name: "test"
- matrix_name: "driver-master-old"
matrix_spec:
driver: "master"
ruby: "ruby-2.5"
mongodb-version: "2.6"
topology: "standalone"
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
run_on:
- ubuntu1404-small
tasks:
- name: "test"
# https://jira.mongodb.org/browse/MONGOID-5133
# - matrix_name: "driver-master-old"
# matrix_spec:
# driver: "master"
# ruby: "ruby-2.5"
# mongodb-version: "2.6"
# topology: "standalone"
# display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
# run_on:
# - ubuntu1404-small
# tasks:
# - name: "test"
- matrix_name: "driver-stable-new"
matrix_spec:
driver: "stable"
Expand All @@ -687,17 +691,18 @@ buildvariants:
- rhel70-small
tasks:
- name: "test"
- matrix_name: "driver-stable-old"
matrix_spec:
driver: "stable"
ruby: ["ruby-2.3","ruby-2.4", "ruby-2.5"]
mongodb-version: "2.6"
topology: "standalone"
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
run_on:
- ubuntu1404-small
tasks:
- name: "test"
# https://jira.mongodb.org/browse/MONGOID-5133
# - matrix_name: "driver-stable-old"
# matrix_spec:
# driver: "stable"
# ruby: ["ruby-2.3","ruby-2.4", "ruby-2.5"]
# mongodb-version: "2.6"
# topology: "standalone"
# display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
# run_on:
# - ubuntu1404-small
# tasks:
# - name: "test"
- matrix_name: "driver-oldstable"
matrix_spec:
driver: "oldstable"
Expand Down Expand Up @@ -827,15 +832,16 @@ buildvariants:
- ubuntu1804-small
tasks:
- name: "test"
- matrix_name: app-tests-jruby
matrix_spec:
driver: current
jruby: jruby-9.2
mongodb-version: '4.2'
topology: standalone
app-tests: yes
display_name: "app tests ${driver}, ${jruby}"
run_on:
- ubuntu1804-small
tasks:
- name: "test"
# https://jira.mongodb.org/browse/MONGOID-5134
# - matrix_name: app-tests-jruby
# matrix_spec:
# driver: current
# jruby: jruby-9.2
# mongodb-version: '4.2'
# topology: standalone
# app-tests: yes
# display_name: "app tests ${driver}, ${jruby}"
# run_on:
# - ubuntu1804-small
# tasks:
# - name: "test"
2 changes: 2 additions & 0 deletions spec/mongoid/clients/options_spec.rb
Expand Up @@ -141,6 +141,8 @@
end

it 'does not disconnect the original cluster' do
skip 'https://jira.mongodb.org/browse/MONGOID-5130'

expect(connections_after).to eq(connections_before)
expect(cluster_before).to be(cluster_after)
end
Expand Down

0 comments on commit 2f3505c

Please sign in to comment.