summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hernandez <scotthernandez@gmail.com>2016-02-09 15:36:59 -0500
committerScott Hernandez <scotthernandez@gmail.com>2016-02-09 18:02:27 -0500
commitd0cd37a4e24a1aa3859409fbb87f0248264040e6 (patch)
tree3240a145bee92cf3451aab9e84bf82baf39893cf
parentf5a9081a412ada3fc8a472b267f932f76b345126 (diff)
downloadmongo-d0cd37a4e24a1aa3859409fbb87f0248264040e6.tar.gz
SERVER-22533: disable ReadConcern.Majority tests for noJournal variant
-rw-r--r--etc/evergreen.yml2
-rw-r--r--jstests/replsets/read_committed.js2
-rw-r--r--jstests/replsets/read_committed_no_snapshots.js2
-rw-r--r--jstests/replsets/read_committed_on_secondary.js2
-rw-r--r--jstests/replsets/read_majority_two_arbs.js2
5 files changed, 9 insertions, 1 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 6eea1742d28..667cd98ecd0 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -2464,7 +2464,7 @@ buildvariants:
push_arch: x86_64
compile_flags: -j$(grep -c ^processor /proc/cpuinfo) CC=/opt/mongodbtoolchain/bin/gcc CXX=/opt/mongodbtoolchain/bin/g++
num_jobs_available: $(grep -c ^processor /proc/cpuinfo)
- test_flags: --nojournal
+ test_flags: --nojournal --excludeWithAnyTags=requires_journaling
tasks:
- name: compile
distros:
diff --git a/jstests/replsets/read_committed.js b/jstests/replsets/read_committed.js
index 06776edcce1..2ed51300534 100644
--- a/jstests/replsets/read_committed.js
+++ b/jstests/replsets/read_committed.js
@@ -1,4 +1,6 @@
/**
+ * @tags: [requires_journaling]
+ *
* Test basic read committed functionality, including:
* - Writes with writeConcern 'majority' should be visible once the write completes.
* - With the only data-bearing secondary down, committed reads should not include newly inserted
diff --git a/jstests/replsets/read_committed_no_snapshots.js b/jstests/replsets/read_committed_no_snapshots.js
index 60b5d7d9ca0..2abf15beb2d 100644
--- a/jstests/replsets/read_committed_no_snapshots.js
+++ b/jstests/replsets/read_committed_no_snapshots.js
@@ -1,4 +1,6 @@
/**
+ * @tags: [requires_journaling]
+ *
* Test basic read committed maxTimeMS timeout while waiting for a committed snapshot:
* - Reads with an 'afterOpTime' snapshot >= current time should be able to see things that
* happened before or at that opTime.
diff --git a/jstests/replsets/read_committed_on_secondary.js b/jstests/replsets/read_committed_on_secondary.js
index 1adf9dffae6..207b1e0373c 100644
--- a/jstests/replsets/read_committed_on_secondary.js
+++ b/jstests/replsets/read_committed_on_secondary.js
@@ -1,4 +1,6 @@
/**
+ * @tags: [requires_journaling]
+ *
* Test basic read committed functionality on a secondary:
* - Updates should not be visible until they are in the blessed snapshot.
* - Updates should be visible once they are in the blessed snapshot.
diff --git a/jstests/replsets/read_majority_two_arbs.js b/jstests/replsets/read_majority_two_arbs.js
index 824b733eaba..b280a0c0ad4 100644
--- a/jstests/replsets/read_majority_two_arbs.js
+++ b/jstests/replsets/read_majority_two_arbs.js
@@ -1,4 +1,6 @@
/**
+ * @tags: [requires_journaling]
+ *
* Tests that writeConcern 'majority' writes succeed and are visible in a replica set that has one
* data-bearing node and two arbiters.
*/