diff options
Diffstat (limited to 'jstests/selinux')
| -rw-r--r-- | jstests/selinux/core.js | 36 | ||||
| -rw-r--r-- | jstests/selinux/default.js | 4 |
2 files changed, 21 insertions, 19 deletions
diff --git a/jstests/selinux/core.js b/jstests/selinux/core.js index cc12e46c122..216420edf2a 100644 --- a/jstests/selinux/core.js +++ b/jstests/selinux/core.js @@ -4,20 +4,6 @@ load('jstests/selinux/lib/selinux_base_test.js'); class TestDefinition extends SelinuxBaseTest { - get config() { - return { - "systemLog": - {"destination": "file", "logAppend": true, "path": "/var/log/mongodb/mongod.log"}, - "storage": {"dbPath": "/var/lib/mongo", "journal": {"enabled": true}}, - "processManagement": { - "fork": true, - "pidFilePath": "/var/run/mongodb/mongod.pid", - "timeZoneInfo": "/usr/share/zoneinfo" - }, - "net": {"port": 27017, "bindIp": "127.0.0.1"} - }; - } - run() { // On RHEL7 there is no python3, but check_has_tag.py will also work with python2 const python = (0 == runNonMongoProgram("which", "python3")) ? "python3" : "python2"; @@ -40,11 +26,31 @@ class TestDefinition extends SelinuxBaseTest { runNonMongoProgram(python, "buildscripts/resmokelib/utils/check_has_tag.py", t, - "no_selinux")) { + "^no_selinux$")) { jsTest.log("Skipping test due to no_selinux tag: " + t); continue; } + // Tests relying on featureFlagXXX will not work + if (HAS_TAG == + runNonMongoProgram(python, + "buildscripts/resmokelib/utils/check_has_tag.py", + t, + "^featureFlag.+$")) { + jsTest.log("Skipping test due to feature flag tag: " + t); + continue; + } + + // Tests relying on featureFlagXXX will not work + if (HAS_TAG == + runNonMongoProgram(python, + "buildscripts/resmokelib/utils/check_has_tag.py", + t, + "^featureFlag.+$")) { + jsTest.log("Skipping test due to feature flag tag: " + t); + continue; + } + jsTest.log("Running test: " + t); if (!load(t)) { throw ("failed to load test " + t); diff --git a/jstests/selinux/default.js b/jstests/selinux/default.js index 9252e84d9b7..4492ecb9e59 100644 --- a/jstests/selinux/default.js +++ b/jstests/selinux/default.js @@ -6,10 +6,6 @@ load('jstests/selinux/lib/selinux_base_test.js'); class TestDefinition extends SelinuxBaseTest { - get config() { - return cat("rpm/mongod.conf"); - } - run() { // The only things we are verifying here: // - that we are connected |