From 316f39218c8719aa3171fbca8f8a84702986e888 Mon Sep 17 00:00:00 2001 From: Yi-Fan Liao Date: Wed, 9 Dec 2015 13:43:41 -0500 Subject: [PATCH 1/2] Re enable smart-system test --- tv_apps/smart-system/test/marionette/app_install_dialog_test.js | 2 +- tv_apps/smart-system/test/marionette/app_modal_dialog_test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tv_apps/smart-system/test/marionette/app_install_dialog_test.js b/tv_apps/smart-system/test/marionette/app_install_dialog_test.js index d1d24c863fda..08fb30137da4 100644 --- a/tv_apps/smart-system/test/marionette/app_install_dialog_test.js +++ b/tv_apps/smart-system/test/marionette/app_install_dialog_test.js @@ -12,7 +12,7 @@ var Server = require('../../../../shared/test/integration/server'); // Bug 1207453 - Skip the test due to unknown test enviroment issue for now. // We should investigate the issue and re-enable the test later. -marionette.skip('app install manager tests', function() { +marionette('app install manager tests', function() { var opts = { apps: {}, diff --git a/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js b/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js index 09f652b8ac07..829d16671d48 100644 --- a/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js +++ b/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js @@ -15,7 +15,7 @@ var AppModalDialog = require('./lib/app_modal_dialog'); // Bug 1207453 - Skip the test due to unknown test enviroment issue for now. // We should investigate the issue and re-enable the test later. -marionette.skip('Test Modal Dialog Events', function() { +marionette('Test Modal Dialog Events', function() { var opts = { apps: {}, From bcc70c4f4bb2df3375e164707dc228b9c1a7478b Mon Sep 17 00:00:00 2001 From: Yi-Fan Liao Date: Thu, 10 Dec 2015 16:48:06 -0500 Subject: [PATCH 2/2] only tv files --- bin/gaia-marionette/gaia-marionette | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/gaia-marionette/gaia-marionette b/bin/gaia-marionette/gaia-marionette index 4d0ff5089a97..65e3919a503c 100755 --- a/bin/gaia-marionette/gaia-marionette +++ b/bin/gaia-marionette/gaia-marionette @@ -151,6 +151,9 @@ fi DEVICE_TYPE_OPT="" if [ -z "$GAIA_DEVICE_TYPE" ] || [ "$GAIA_DEVICE_TYPE" = "phone" ]; then DEVICE_TYPE_OPT="--device-type phone" +else if [ "$GAIA_DEVICE_TYPE" = "tv" ]; then + DEVICE_TYPE_OPT="--device-type tv" + TEST_FILES=$(find "$BINDIR/.." -path "*/tv_apps/$APP/test/marionette/*_test.js" $SKIP_TEST_FILES) else DEVICE_TYPE_OPT="--device-type $GAIA_DEVICE_TYPE" fi