diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-07-09 13:45:44 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-07-09 13:45:44 +1000 |
| commit | b66fe5d7dbd638493709b04ae8985705fdf73d50 (patch) | |
| tree | 046eb3f93a2da91cb3a985ac9e7a1544f977a27a /test/suite | |
| parent | abf36e7d35df9768cfb462b440f37a8fdb51f864 (diff) | |
| parent | 77c7fbdf9bda9117d0ad58e091609f05ba2c928a (diff) | |
| download | mongo-b66fe5d7dbd638493709b04ae8985705fdf73d50.tar.gz | |
Merge branch 'develop' into logging.
Conflicts:
src/config/config_def.c
test/suite/test_config03.py
Diffstat (limited to 'test/suite')
| -rw-r--r-- | test/suite/test_config03.py | 2 | ||||
| -rw-r--r-- | test/suite/test_config04.py | 2 | ||||
| -rw-r--r-- | test/suite/test_txn01.py | 3 | ||||
| -rw-r--r-- | test/suite/test_txn02.py | 3 | ||||
| -rw-r--r-- | test/suite/test_txn03.py | 3 |
5 files changed, 5 insertions, 8 deletions
diff --git a/test/suite/test_config03.py b/test/suite/test_config03.py index d0d29366103..cc9ad9815fb 100644 --- a/test/suite/test_config03.py +++ b/test/suite/test_config03.py @@ -66,7 +66,7 @@ class test_config03(test_base03.test_base03): config_vars = [ 'cache_size', 'create', 'error_prefix', 'eviction_target', 'eviction_trigger', 'hazard_max', 'multiprocess', - 'session_max', 'transactional', 'verbose' ] + 'session_max', 'verbose' ] all_scenarios = wtscenario.multiply_scenarios('_', cache_size_scenarios, create_scenarios, error_prefix_scenarios, diff --git a/test/suite/test_config04.py b/test/suite/test_config04.py index 2d48c2668f3..897d7ecdc6a 100644 --- a/test/suite/test_config04.py +++ b/test/suite/test_config04.py @@ -174,7 +174,7 @@ class test_config04(wttest.WiredTigerTestCase): def test_transactional(self): # Note: this will have functional tests in the future. - self.common_test('transactional') + self.common_test('') if __name__ == '__main__': wttest.run() diff --git a/test/suite/test_txn01.py b/test/suite/test_txn01.py index 51af0532c37..6600ff68ada 100644 --- a/test/suite/test_txn01.py +++ b/test/suite/test_txn01.py @@ -43,8 +43,7 @@ class test_txn01(wttest.WiredTigerTestCase): # Overrides WiredTigerTestCase def setUpConnectionOpen(self, dir): conn = wiredtiger.wiredtiger_open(dir, 'create,' + - ('error_prefix="%s: ",' % self.shortid()) + - 'transactional,') + ('error_prefix="%s: ",' % self.shortid())) self.pr(`conn`) return conn diff --git a/test/suite/test_txn02.py b/test/suite/test_txn02.py index f1926024ffe..ec0e2240f3d 100644 --- a/test/suite/test_txn02.py +++ b/test/suite/test_txn02.py @@ -75,8 +75,7 @@ class test_txn02(wttest.WiredTigerTestCase): # Overrides WiredTigerTestCase def setUpConnectionOpen(self, dir): conn = wiredtiger.wiredtiger_open(dir, 'create,' + - ('error_prefix="%s: ",' % self.shortid()) + - 'transactional,') + ('error_prefix="%s: ",' % self.shortid())) self.pr(`conn`) self.session2 = conn.open_session() return conn diff --git a/test/suite/test_txn03.py b/test/suite/test_txn03.py index aa074677a57..f86d47d41c4 100644 --- a/test/suite/test_txn03.py +++ b/test/suite/test_txn03.py @@ -48,8 +48,7 @@ class test_txn03(wttest.WiredTigerTestCase): # Overrides WiredTigerTestCase def setUpConnectionOpen(self, dir): conn = wiredtiger.wiredtiger_open(dir, 'create,' + - ('error_prefix="%s: ",' % self.shortid()) + - 'transactional,') + ('error_prefix="%s: ",' % self.shortid())) self.pr(`conn`) return conn |