summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorRobert Guo <robertguo@me.com>2016-07-06 12:57:02 -0400
committerRobert Guo <robertguo@me.com>2016-07-06 13:40:19 -0400
commit598b6fa7c2545805ac945a64da9bb24df63db624 (patch)
treefd732a4a3615e90e11b93cc12b750d22dcf019fb /buildscripts
parenta05bea91482fa70583680596823a115293d9d9a6 (diff)
downloadmongo-598b6fa7c2545805ac945a64da9bb24df63db624.tar.gz
SERVER-24923 TypeError when running unittests
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokelib/testing/testcases.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/buildscripts/resmokelib/testing/testcases.py b/buildscripts/resmokelib/testing/testcases.py
index 5d20649500c..5ffbefcb672 100644
--- a/buildscripts/resmokelib/testing/testcases.py
+++ b/buildscripts/resmokelib/testing/testcases.py
@@ -78,7 +78,7 @@ class TestCase(unittest.TestCase):
def shortDescription(self):
return "%s %s" % (self.test_kind, self.test_name)
- def configure(self, fixture):
+ def configure(self, fixture, *args, **kwargs):
"""
Stores 'fixture' as an attribute for later use during execution.
"""
@@ -178,8 +178,8 @@ class CPPIntegrationTestCase(TestCase):
self.program_executable = program_executable
self.program_options = utils.default_if_none(program_options, {}).copy()
- def configure(self, fixture):
- TestCase.configure(self, fixture)
+ def configure(self, fixture, *args, **kwargs):
+ TestCase.configure(self, fixture, *args, **kwargs)
self.program_options["connectionString"] = self.fixture.get_connection_string()
@@ -222,8 +222,8 @@ class DBTestCase(TestCase):
self.dbtest_suite = dbtest_suite
self.dbtest_options = utils.default_if_none(dbtest_options, {}).copy()
- def configure(self, fixture):
- TestCase.configure(self, fixture)
+ def configure(self, fixture, *args, **kwargs):
+ TestCase.configure(self, fixture, *args, **kwargs)
# If a dbpath was specified, then use it as a container for all other dbpaths.
dbpath_prefix = self.dbtest_options.pop("dbpath", DBTestCase._get_dbpath_prefix())
@@ -317,8 +317,8 @@ class JSTestCase(TestCase):
self.shell_options = utils.default_if_none(shell_options, {}).copy()
self.num_clients = JSTestCase.DEFAULT_CLIENT_NUM
- def configure(self, fixture, num_clients=DEFAULT_CLIENT_NUM):
- TestCase.configure(self, fixture)
+ def configure(self, fixture, num_clients=DEFAULT_CLIENT_NUM, *args, **kwargs):
+ TestCase.configure(self, fixture, *args, **kwargs)
if self.fixture.port is not None:
self.shell_options["port"] = self.fixture.port
@@ -434,12 +434,12 @@ class MongosTestCase(TestCase):
TestCase.__init__(self, logger, "mongos", self.mongos_executable)
self.options = mongos_options.copy()
- def configure(self, fixture):
+ def configure(self, fixture, *args, **kwargs):
"""
Ensures the --test option is present in the mongos options.
"""
- TestCase.configure(self, fixture)
+ TestCase.configure(self, fixture, *args, **kwargs)
# Always specify test option to ensure the mongos will terminate.
if "test" not in self.options:
self.options["test"] = ""