mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-35523 fix fsmworkloadtestcase

Browse Source
This commit is contained in:
Robert Guo 2018-06-20 09:59:26 -04:00
parent c4db1cc5da
commit 5c73ea14a6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildscripts/resmokelib/testing/testcases/fsm_workload_test.py
View File

@ -50,14 +50,12 @@ class FSMWorkloadTestCase(jsrunnerfile.JSRunnerFileTestCase):
self.shell_options["global_vars"] = global_vars
def _populate_test_data(self, test_data):
test_data["fsmWorkloads"] = self.fsm_workload_group
test_data["fsmWorkloads"] = self.fsm_workload_group
test_data["resmokeDbPathPrefix"] = self.dbpath_prefix
with FSMWorkloadTestCase._COUNTER_LOCK:
count = FSMWorkloadTestCase._COUNTER
if not self.same_db:
FSMWorkloadTestCase._COUNTER += 1
FSMWorkloadTestCase._COUNTER += 1
# We use a global incrementing counter as a prefix for the database name to avoid any
# collection lifecycle related issues in sharded clusters. This more closely matches how
@ -65,10 +63,8 @@ class FSMWorkloadTestCase(jsrunnerfile.JSRunnerFileTestCase):
# for each FSM workload in the entire schedule by runner.js.
test_prefix = self.db_name_prefix if self.db_name_prefix else "test"
test_data["dbNamePrefix"] = "{}{:d}_".format(test_prefix, count)
if not self.same_db:
test_data["sameDB"] = True
if not self.same_collection:
test_data["sameCollection"] = True
test_data["sameDB"] = self.same_db
test_data["sameCollection"] = self.same_collection
@staticmethod
def get_workload_group(selected_tests):

3
jstests/concurrency/fsm_libs/resmoke_runner.js
View File

@ -218,6 +218,9 @@
throw new Error('Unrecognized topology format: ' + tojson(topology));
}
clusterOptions.sameDB = TestData.sameDB;
clusterOptions.sameCollection = TestData.sameCollection;
let workloads = TestData.fsmWorkloads;
let sessionOptions = {};