jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404697 )
Change subject: Stop service-runner so that cli invoked rt test exits
......................................................................
Stop service-runner so that cli invoked rt test exits
Follow up to fda2c79 where process.exit became conditional.
Change-Id: Ida82d19f3fdd30201b0507d15e1ec5abcaa1c0a4
---
M bin/roundtrip-test.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
C. Scott Ananian: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/roundtrip-test.js b/bin/roundtrip-test.js
index 5fb2da8..c5c8126 100755
--- a/bin/roundtrip-test.js
+++ b/bin/roundtrip-test.js
@@ -746,6 +746,7 @@
}
var title = String(argv._[0]);
+ var ret = null;
if (!argv.parsoidURL) {
// Start our own Parsoid server
var serviceWrapper =
require('../tests/serviceWrapper.js');
@@ -758,13 +759,16 @@
} else {
serverOpts.skipMock = true;
}
- var ret = yield serviceWrapper.runServices(serverOpts);
+ ret = yield serviceWrapper.runServices(serverOpts);
argv.parsoidURL = ret.parsoidURL;
}
var formatter = Util.booleanOption(argv.xml) ?
xmlFormat : plainFormat;
var r = yield runTests(title, argv, formatter);
console.log(r.output);
+ if (ret !== null) {
+ yield ret.runner.stop();
+ }
if (argv.check) {
process.exit(r.exitCode);
}
--
To view, visit https://gerrit.wikimedia.org/r/404697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida82d19f3fdd30201b0507d15e1ec5abcaa1c0a4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[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
