Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Re enable smart-system test #33548

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Re enable smart-system test #33548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
316f392
Re enable smart-system test
begeeben Dec 9, 2015
bcc70c4
only tv files
begeeben Dec 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bin/gaia-marionette/gaia-marionette
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tv_apps/smart-system/test/marionette/app_install_dialog_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {},
Expand Down
2 changes: 1 addition & 1 deletion tv_apps/smart-system/test/marionette/app_modal_dialog_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {},
Expand Down