diff options
| author | Charlie Swanson <charlie.swanson@mongodb.com> | 2015-10-13 16:55:41 -0400 |
|---|---|---|
| committer | Charlie Swanson <charlie.swanson@mongodb.com> | 2015-10-13 18:12:11 -0400 |
| commit | b3b1be01f9c8f2f6a9e303602fb070aa854f5cf3 (patch) | |
| tree | 0fdb684dea28d2186eacc7d2df5cc42dbe21521c | |
| parent | fa0ea5f7e932f11dfefa24691b47c3d4a7230c71 (diff) | |
| download | mongo-b3b1be01f9c8f2f6a9e303602fb070aa854f5cf3.tar.gz | |
SERVER-20414 Move httpinterface tests into their own suite
| -rw-r--r-- | buildscripts/resmokeconfig/suites/httpinterface.yml | 15 | ||||
| -rw-r--r-- | buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml | 3 | ||||
| -rw-r--r-- | etc/evergreen.yml | 13 | ||||
| -rw-r--r-- | jstests/httpinterface/httpinterface.js (renamed from jstests/noPassthroughWithMongod/httpinterface.js) | 0 | ||||
| -rw-r--r-- | jstests/httpinterface/network_options.js (renamed from jstests/noPassthrough/network_options.js) | 0 |
5 files changed, 28 insertions, 3 deletions
diff --git a/buildscripts/resmokeconfig/suites/httpinterface.yml b/buildscripts/resmokeconfig/suites/httpinterface.yml new file mode 100644 index 00000000000..0a1b849b9d0 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/httpinterface.yml @@ -0,0 +1,15 @@ +selector: + js_test: + roots: + - jstests/httpinterface/*.js + exclude_files: + # SERVER-19093 No longer have proper HTTP support in the shell. + - jstests/httpinterface/httpinterface.js +executor: + js_test: + hooks: + fixture: + class: MongoDFixture + mongod_options: + set_parameters: + enableTestCommands: 1 diff --git a/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml b/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml index 6705bfb5eb7..6d7834272c8 100644 --- a/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml +++ b/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml @@ -2,9 +2,6 @@ selector: js_test: roots: - jstests/noPassthroughWithMongod/*.js - exclude_files: - # SERVER-19093 - - jstests/noPassthroughWithMongod/httpinterface.js executor: js_test: diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 755846c3df1..fd6ec4198ff 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -839,6 +839,14 @@ tasks: run_multiple_jobs: true - <<: *task_template + name: httpinterface + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_args: --suites=httpinterface + +- <<: *task_template name: integration_tests_standalone commands: - func: "do setup" @@ -2077,6 +2085,7 @@ buildvariants: - name: gle_auth_basics_passthrough_WT - name: gle_auth_basics_passthrough_write_cmd - name: gle_auth_basics_passthrough_write_cmd_WT + - name: httpinterface - name: integration_tests_standalone - name: integration_tests_replset - name: sharding_gle_auth_basics_passthrough @@ -3014,6 +3023,7 @@ buildvariants: - name: disk - name: durability - name: failpoints + - name: httpinterface - name: integration_tests_standalone - name: integration_tests_replset - name: jsCore @@ -3263,6 +3273,7 @@ buildvariants: - name: sharding_gle_auth_basics_passthrough_WT - name: sharding_gle_auth_basics_passthrough_write_cmd - name: sharding_gle_auth_basics_passthrough_write_cmd_WT + - name: httpinterface - name: jsCore - name: jsCore_WT - name: jsCore_compatibility @@ -4201,6 +4212,7 @@ buildvariants: - name: disk - name: durability - name: failpoints + - name: httpinterface - name: jsCore - name: jsCore_compatibility - name: jsCore_compatibility_WT @@ -4507,6 +4519,7 @@ buildvariants: - name: gle_auth_basics_passthrough_write_cmd_WT - name: gle_auth_write_cmd - name: gle_auth_write_cmd_WT + - name: httpinterface - name: integration_tests_standalone - name: integration_tests_replset - name: jsCore diff --git a/jstests/noPassthroughWithMongod/httpinterface.js b/jstests/httpinterface/httpinterface.js index d3804cc40f1..d3804cc40f1 100644 --- a/jstests/noPassthroughWithMongod/httpinterface.js +++ b/jstests/httpinterface/httpinterface.js diff --git a/jstests/noPassthrough/network_options.js b/jstests/httpinterface/network_options.js index 33f117f980b..33f117f980b 100644 --- a/jstests/noPassthrough/network_options.js +++ b/jstests/httpinterface/network_options.js |