jenkins-bot has submitted this change and it was merged.
Change subject: Fix rt-testing with apiURL
......................................................................
Fix rt-testing with apiURL
* node roundtrip-test.js --apiURL is broken. The rttest.localsetting.js
sets the prefix `localhost` for the supplied url, but
Util.setTemplatingAndProcessingFlags configures it as `customwiki`.
The result being that api isn't found.
* Also, setting an environment var to `undefined` coerces it to the
string 'undefined'. That in turn meant that we were always
configuring a default MwApi.
Change-Id: I2190a3d758a8d259e23e91ddf8dca7bc63fb503a
---
M tests/apiServer.js
M tests/roundtrip-test.js
M tests/rttest.localsettings.js
3 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/apiServer.js b/tests/apiServer.js
index b86038b..0a67627 100644
--- a/tests/apiServer.js
+++ b/tests/apiServer.js
@@ -107,7 +107,7 @@
PORT: port,
INTERFACE: opts.iface,
NODE_PATH: process.env.NODE_PATH,
- PARSOID_MOCKAPI_URL: opts.mockUrl,
+ PARSOID_MOCKAPI_URL: opts.mockUrl || '',
},
execArgv: execArgv,
}
diff --git a/tests/roundtrip-test.js b/tests/roundtrip-test.js
index 244eba1..5cbfd28 100755
--- a/tests/roundtrip-test.js
+++ b/tests/roundtrip-test.js
@@ -701,8 +701,9 @@
// script that takes care of setting everything up.
var apiServer = require('./apiServer.js');
var parsoidOptions = { quiet: true };
- if (opts.apiURL) {
- parsoidOptions.mockUrl = opts.apiURL;
+ if (argv.apiURL) {
+ parsoidOptions.mockUrl = argv.apiURL;
+ argv.prefix = 'customwiki';
}
apiServer.exitOnProcessTerm();
return
apiServer.startParsoidServer(parsoidOptions).then(function(ret) {
diff --git a/tests/rttest.localsettings.js b/tests/rttest.localsettings.js
index 7fa584f..7c5f587 100644
--- a/tests/rttest.localsettings.js
+++ b/tests/rttest.localsettings.js
@@ -10,7 +10,7 @@
exports.setup = function(parsoidConfig) {
// The URL of your MediaWiki API endpoint.
if (process.env.PARSOID_MOCKAPI_URL) {
- parsoidConfig.setMwApi('localhost', { uri:
process.env.PARSOID_MOCKAPI_URL });
+ parsoidConfig.setMwApi('customwiki', { uri:
process.env.PARSOID_MOCKAPI_URL });
}
// We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly
--
To view, visit https://gerrit.wikimedia.org/r/230919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2190a3d758a8d259e23e91ddf8dca7bc63fb503a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
