diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-04-13 07:30:20 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-04-13 07:30:20 -0400 |
| commit | 3119d07501faab0155e821d26234edeb3e45d03d (patch) | |
| tree | 058a2bb6471f8cb6b90f7d0bb1c12da3bd0b542a /test/suite | |
| parent | dbb58f0b8f7b26a70f71f6c67dba93c966b162e0 (diff) | |
| parent | 3ceb7997b971c2351fa91a37510644ee09d1c3c1 (diff) | |
| download | mongo-3119d07501faab0155e821d26234edeb3e45d03d.tar.gz | |
Merge branch 'develop' into cursor-pin
Diffstat (limited to 'test/suite')
| -rw-r--r-- | test/suite/test_sweep01.py | 11 | ||||
| -rw-r--r-- | test/suite/test_sweep02.py | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/test/suite/test_sweep01.py b/test/suite/test_sweep01.py index b0a9adcf44e..f5e2aa96cbe 100644 --- a/test/suite/test_sweep01.py +++ b/test/suite/test_sweep01.py @@ -63,7 +63,8 @@ class test_sweep01(wttest.WiredTigerTestCase, suite_subprocess): # That matches the ratio of the default 10 and 30 seconds. conn_params = \ ',create,error_prefix="%s: ",' % self.shortid() + \ - 'file_manager=(close_idle_time=6,close_scan_interval=2),' + \ + 'file_manager=(close_handle_minimum=0,' + \ + 'close_idle_time=6,close_scan_interval=2),' + \ 'checkpoint=(wait=%d),' % self.ckpt + \ 'statistics=(fast),' # print "Creating conn at '%s' with config '%s'" % (dir, conn_params) @@ -76,7 +77,6 @@ class test_sweep01(wttest.WiredTigerTestCase, suite_subprocess): return conn def test_ops(self): - # # Set up numfiles with numkv entries. We just want some data in there # we don't care what it is. @@ -174,8 +174,9 @@ class test_sweep01(wttest.WiredTigerTestCase, suite_subprocess): print "ref1: " + str(ref1) + " ref2: " + str(ref2) print "XX: nfile1: " + str(nfile1) + " nfile2: " + str(nfile2) self.assertEqual(nfile2 < nfile1, True) - # The only files that should be left is the metadata and the active one. - if (nfile2 != 2): + # The only files that should be left is the metadata, the lock file + # and the active file. + if (nfile2 != 3): print "close1: " + str(close1) + " close2: " + str(close2) print "sweep1: " + str(sweep1) + " sweep2: " + str(sweep2) print "sclose1: " + str(sclose1) + " sclose2: " + str(sclose2) @@ -183,7 +184,7 @@ class test_sweep01(wttest.WiredTigerTestCase, suite_subprocess): print "tod1: " + str(tod1) + " tod2: " + str(tod2) print "ref1: " + str(ref1) + " ref2: " + str(ref2) print "XX2: nfile1: " + str(nfile1) + " nfile2: " + str(nfile2) - self.assertEqual(nfile2 == 2, True) + self.assertEqual(nfile2 == 3, True) if __name__ == '__main__': wttest.run() diff --git a/test/suite/test_sweep02.py b/test/suite/test_sweep02.py index 3691bdaf35f..b1d065812b0 100644 --- a/test/suite/test_sweep02.py +++ b/test/suite/test_sweep02.py @@ -61,6 +61,10 @@ class test_sweep02(wttest.WiredTigerTestCase): self.base_config + "file_manager=(close_idle_time=1)") def test_config04(self): + self.conn = wiredtiger_open(self.dir, + self.base_config + "file_manager=(close_handle_minimum=500)") + + def test_config05(self): self.conn = wiredtiger_open(self.dir, self.base_config + \ "file_manager=(close_scan_interval=1,close_idle_time=1)") |