diff options
| author | Jonathan Abrahams <jonathan@mongodb.com> | 2016-02-01 08:56:03 -0500 |
|---|---|---|
| committer | Jonathan Abrahams <jonathan@mongodb.com> | 2016-02-01 08:56:33 -0500 |
| commit | d9433cc3abcd84e8686716238d8446a2f994e003 (patch) | |
| tree | 846aaea1261da8e02e08d828f7a7825a1ed040ff | |
| parent | 3e41f72b36656a58f28fea3314e50aa7dcac47c9 (diff) | |
| download | mongo-d9433cc3abcd84e8686716238d8446a2f994e003.tar.gz | |
SERVER-18144 Remove references to TestData.testFile and TestData.testPath
| -rwxr-xr-x | buildscripts/smoke.py | 2 | ||||
| -rw-r--r-- | src/mongo/shell/utils.js | 16 |
2 files changed, 0 insertions, 18 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py index bb883546c62..d2add18cafd 100755 --- a/buildscripts/smoke.py +++ b/buildscripts/smoke.py @@ -577,8 +577,6 @@ def runTest(test, result): 'TestData.wiredTigerEngineConfigString = "' + ternary( wiredtiger_engine_config_string, wiredtiger_engine_config_string, "" ) + '";' + \ 'TestData.wiredTigerCollectionConfigString = "' + ternary( wiredtiger_collection_config_string, wiredtiger_collection_config_string, "" ) + '";' + \ 'TestData.wiredTigerIndexConfigString = "' + ternary( wiredtiger_index_config_string, wiredtiger_index_config_string, "" ) + '";' + \ - 'TestData.testPath = "' + path + '";' + \ - 'TestData.testFile = "' + os.path.basename( path ) + '";' + \ 'TestData.testName = "' + re.sub( ".js$", "", os.path.basename( path ) ) + '";' + \ 'TestData.setParameters = "' + ternary( set_parameters, set_parameters, "" ) + '";' + \ 'TestData.setParametersMongos = "' + ternary( set_parameters_mongos, set_parameters_mongos, "" ) + '";' + \ diff --git a/src/mongo/shell/utils.js b/src/mongo/shell/utils.js index 1338cc4b942..55c6367fe25 100644 --- a/src/mongo/shell/utils.js +++ b/src/mongo/shell/utils.js @@ -161,16 +161,6 @@ jsTestName = function(){ return "__unknown_name__" } -jsTestFile = function(){ - if( TestData ) return TestData.testFile - return "__unknown_file__" -} - -jsTestPath = function(){ - if( TestData ) return TestData.testPath - return "__unknown_path__" -} - var _jsTestOptions = { enableTestCommands : true }; // Test commands should be enabled by default jsTestOptions = function(){ @@ -219,8 +209,6 @@ jsTestLog = function(msg){ jsTest = {} jsTest.name = jsTestName -jsTest.file = jsTestFile -jsTest.path = jsTestPath jsTest.options = jsTestOptions jsTest.setOption = setJsTestOption jsTest.log = jsTestLog @@ -228,10 +216,6 @@ jsTest.readOnlyUserRoles = ["read"] jsTest.basicUserRoles = ["dbOwner"] jsTest.adminUserRoles = ["root"] -jsTest.dir = function(){ - return jsTest.path().replace( /\/[^\/]+$/, "/" ) -} - jsTest.authenticate = function(conn) { if (!jsTest.options().auth && !jsTest.options().keyFile) { conn.authenticated = true; |