Skip to content

Commit 5111234

Browse files
MONGOID-5130 Disable Clients::Options#with test (#5018)
1 parent 6cc7001 commit 5111234

File tree

2 files changed

+67
-59
lines changed

2 files changed

+67
-59
lines changed

.evergreen/config.yml

Lines changed: 65 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,10 @@ axes:
438438
- id: "os"
439439
display_name: OS
440440
values:
441-
- id: ubuntu-14.04
442-
display_name: "Ubuntu 14.04"
443-
run_on: ubuntu1404-small
441+
# https://jira.mongodb.org/browse/MONGOID-5133
442+
# - id: ubuntu-14.04
443+
# display_name: "Ubuntu 14.04"
444+
# run_on: ubuntu1404-small
444445
- id: ubuntu-16.04
445446
display_name: "Ubuntu 16.04"
446447
run_on: ubuntu1604-small
@@ -588,17 +589,18 @@ buildvariants:
588589
- ubuntu1804-small
589590
tasks:
590591
- name: "test"
591-
- matrix_name: "topologies-old"
592-
matrix_spec:
593-
driver: current
594-
ruby: "ruby-2.6"
595-
mongodb-version: ['2.6', '3.0', '3.2', '3.4']
596-
topology: ["replica-set", "sharded-cluster"]
597-
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
598-
run_on:
599-
- ubuntu1404-small
600-
tasks:
601-
- name: "test"
592+
# https://jira.mongodb.org/browse/MONGOID-5133
593+
# - matrix_name: "topologies-old"
594+
# matrix_spec:
595+
# driver: current
596+
# ruby: "ruby-2.6"
597+
# mongodb-version: ['2.6', '3.0', '3.2', '3.4']
598+
# topology: ["replica-set", "sharded-cluster"]
599+
# display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
600+
# run_on:
601+
# - ubuntu1404-small
602+
# tasks:
603+
# - name: "test"
602604
- matrix_name: "mongodb"
603605
matrix_spec:
604606
driver: "current"
@@ -610,17 +612,18 @@ buildvariants:
610612
- rhel70-small
611613
tasks:
612614
- name: "test"
613-
- matrix_name: "mongodb-old"
614-
matrix_spec:
615-
driver: "current"
616-
ruby: "ruby-2.5"
617-
mongodb-version: ["3.0", "2.6"]
618-
topology: "standalone"
619-
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
620-
run_on:
621-
- ubuntu1404-small
622-
tasks:
623-
- name: "test"
615+
# https://jira.mongodb.org/browse/MONGOID-5133
616+
# - matrix_name: "mongodb-old"
617+
# matrix_spec:
618+
# driver: "current"
619+
# ruby: "ruby-2.5"
620+
# mongodb-version: ["3.0", "2.6"]
621+
# topology: "standalone"
622+
# display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
623+
# run_on:
624+
# - ubuntu1404-small
625+
# tasks:
626+
# - name: "test"
624627
- matrix_name: "jruby-new"
625628
matrix_spec:
626629
driver: "current"
@@ -665,17 +668,18 @@ buildvariants:
665668
- rhel70-small
666669
tasks:
667670
- name: "test"
668-
- matrix_name: "driver-master-old"
669-
matrix_spec:
670-
driver: "master"
671-
ruby: "ruby-2.5"
672-
mongodb-version: "2.6"
673-
topology: "standalone"
674-
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
675-
run_on:
676-
- ubuntu1404-small
677-
tasks:
678-
- name: "test"
671+
# https://jira.mongodb.org/browse/MONGOID-5133
672+
# - matrix_name: "driver-master-old"
673+
# matrix_spec:
674+
# driver: "master"
675+
# ruby: "ruby-2.5"
676+
# mongodb-version: "2.6"
677+
# topology: "standalone"
678+
# display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
679+
# run_on:
680+
# - ubuntu1404-small
681+
# tasks:
682+
# - name: "test"
679683
- matrix_name: "driver-stable-new"
680684
matrix_spec:
681685
driver: "stable"
@@ -687,17 +691,18 @@ buildvariants:
687691
- rhel70-small
688692
tasks:
689693
- name: "test"
690-
- matrix_name: "driver-stable-old"
691-
matrix_spec:
692-
driver: "stable"
693-
ruby: ["ruby-2.3","ruby-2.4", "ruby-2.5"]
694-
mongodb-version: "2.6"
695-
topology: "standalone"
696-
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
697-
run_on:
698-
- ubuntu1404-small
699-
tasks:
700-
- name: "test"
694+
# https://jira.mongodb.org/browse/MONGOID-5133
695+
# - matrix_name: "driver-stable-old"
696+
# matrix_spec:
697+
# driver: "stable"
698+
# ruby: ["ruby-2.3","ruby-2.4", "ruby-2.5"]
699+
# mongodb-version: "2.6"
700+
# topology: "standalone"
701+
# display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
702+
# run_on:
703+
# - ubuntu1404-small
704+
# tasks:
705+
# - name: "test"
701706
- matrix_name: "driver-oldstable"
702707
matrix_spec:
703708
driver: "oldstable"
@@ -827,15 +832,16 @@ buildvariants:
827832
- ubuntu1804-small
828833
tasks:
829834
- name: "test"
830-
- matrix_name: app-tests-jruby
831-
matrix_spec:
832-
driver: current
833-
jruby: jruby-9.2
834-
mongodb-version: '4.2'
835-
topology: standalone
836-
app-tests: yes
837-
display_name: "app tests ${driver}, ${jruby}"
838-
run_on:
839-
- ubuntu1804-small
840-
tasks:
841-
- name: "test"
835+
# https://jira.mongodb.org/browse/MONGOID-5134
836+
# - matrix_name: app-tests-jruby
837+
# matrix_spec:
838+
# driver: current
839+
# jruby: jruby-9.2
840+
# mongodb-version: '4.2'
841+
# topology: standalone
842+
# app-tests: yes
843+
# display_name: "app tests ${driver}, ${jruby}"
844+
# run_on:
845+
# - ubuntu1804-small
846+
# tasks:
847+
# - name: "test"

spec/mongoid/clients/options_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@
141141
end
142142

143143
it 'does not disconnect the original cluster' do
144+
skip 'https://jira.mongodb.org/browse/MONGOID-5130'
145+
144146
expect(connections_after).to eq(connections_before)
145147
expect(cluster_before).to be(cluster_after)
146148
end

0 commit comments

Comments
 (0)