diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-05-06 09:40:40 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-05-06 09:40:40 +1000 |
| commit | 9b933769ce25f30b67a0d3124cf3366680dc10c8 (patch) | |
| tree | 1a21ef8197e88ff749ef6d43ed7c838d455b7d13 /test | |
| parent | b77ac5b293bf73275a065c9550360c4b56489e0e (diff) | |
| parent | d2c02e3276cc1fa41ba5324852523d9c52199e9a (diff) | |
| download | mongo-9b933769ce25f30b67a0d3124cf3366680dc10c8.tar.gz | |
Merge branch 'develop' into optional-verbose
Diffstat (limited to 'test')
| -rw-r--r-- | test/suite/test_config02.py | 9 | ||||
| -rw-r--r-- | test/suite/test_priv01.py | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/test/suite/test_config02.py b/test/suite/test_config02.py index 898f5f56de6..1edcab5756d 100644 --- a/test/suite/test_config02.py +++ b/test/suite/test_config02.py @@ -82,9 +82,12 @@ class test_config02(wttest.WiredTigerTestCase): os.unsetenv('WIREDTIGER_HOME') else: os.putenv('WIREDTIGER_HOME', homeenv) - self.conn = wiredtiger.wiredtiger_open(homearg, configarg) - self.session = self.conn.open_session(None) - self.populate_and_check() + try: + self.conn = wiredtiger.wiredtiger_open(homearg, configarg) + self.session = self.conn.open_session(None) + self.populate_and_check() + finally: + os.unsetenv('WIREDTIGER_HOME') def test_home_nohome(self): self.common_test(None, None, None) diff --git a/test/suite/test_priv01.py b/test/suite/test_priv01.py index a2a58862177..99e584aab6c 100644 --- a/test/suite/test_priv01.py +++ b/test/suite/test_priv01.py @@ -94,9 +94,12 @@ class test_priv01(wttest.WiredTigerTestCase): os.unsetenv('WIREDTIGER_HOME') else: os.putenv('WIREDTIGER_HOME', homeenv) - self.conn = wiredtiger.wiredtiger_open(homearg, configarg) - self.session = self.conn.open_session(None) - self.populate_and_check() + try: + self.conn = wiredtiger.wiredtiger_open(homearg, configarg) + self.session = self.conn.open_session(None) + self.populate_and_check() + finally: + os.unsetenv('WIREDTIGER_HOME') def test_home_and_env_conf_priv(self): # If homedir is set, the environment is ignored |