You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by al...@apache.org on 2016/09/29 16:01:39 UTC
[2/2] cordova-paramedic git commit: Better file transfer server clean
up
Better file transfer server clean up
Project: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/commit/91c906ff
Tree: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/tree/91c906ff
Diff: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/diff/91c906ff
Branch: refs/heads/master
Commit: 91c906ff3c14015a42c67784989511fb4efa9e91
Parents: 3315570
Author: Alexander Sorokin <al...@akvelon.com>
Authored: Thu Sep 29 19:00:44 2016 +0300
Committer: Alexander Sorokin <al...@akvelon.com>
Committed: Thu Sep 29 19:00:44 2016 +0300
----------------------------------------------------------------------
lib/paramedic.js | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/91c906ff/lib/paramedic.js
----------------------------------------------------------------------
diff --git a/lib/paramedic.js b/lib/paramedic.js
index 24aea6f..fc7601b 100644
--- a/lib/paramedic.js
+++ b/lib/paramedic.js
@@ -226,22 +226,28 @@ ParamedicRunner.prototype.buildApp = function () {
});
};
-ParamedicRunner.prototype.runLocalTests = function () {
+ParamedicRunner.prototype.maybeRunFileTransferServer = function () {
var self = this;
-
- if (!self.config.runMainTests() && self.config.getPlatformId() !== 'android') {
- logger.normal('Skipping main tests...');
- return Q(util.TEST_PASSED);
- }
-
return Q().then(function () {
var plugins = self.config.getPlugins();
for (var i = 0; i < plugins.length; i++) {
if (plugins[i].indexOf('cordova-plugin-file-transfer') >= 0) {
- logger.warn('found cordova-plugin-file-transfer in ' + plugins[i]);
return self.server.startFileTransferServer(self.tempFolder.name);
}
}
+ });
+};
+
+ParamedicRunner.prototype.runLocalTests = function () {
+ var self = this;
+
+ if (!self.config.runMainTests() && self.config.getPlatformId() !== 'android') {
+ logger.normal('Skipping main tests...');
+ return Q(util.TEST_PASSED);
+ }
+
+ Q().then(function () {
+ return self.maybeRunFileTransferServer();
})
.then(function () {
return self.getCommandForStartingTests();
@@ -267,10 +273,6 @@ ParamedicRunner.prototype.runLocalTests = function () {
self.waitForConnection().catch(reject);
// resolve if got results
self.waitForTests().then(resolve);
- })
- .then(function (result) {
- self.server.cleanUp();
- return result;
});
}
@@ -452,6 +454,7 @@ ParamedicRunner.prototype.waitForConnection = function () {
};
ParamedicRunner.prototype.cleanUpProject = function () {
+ this.server.cleanUp();
if (this.config.shouldCleanUpAfterRun()) {
logger.info('cordova-paramedic: Deleting the application: ' + this.tempFolder.name);
shell.popd();
@@ -745,7 +748,7 @@ ParamedicRunner.prototype.runSauceTests = function () {
return Q(util.TEST_PASSED);
}
- logger.info('cordova-paramedic: running sauce tests');
+ logger.info('cordova-paramedic: running tests with sauce');
return this.buildApp()
.then(self.packageApp.bind(self))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org