Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Re-enable ChromeOS testing #6559

Closed
wants to merge 12 commits into from
2 changes: 1 addition & 1 deletion .github/workflows/shaka-bot-commands/command-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ WORKFLOW_ARGS=( "pr=$PR_NUMBER" )

case "${SHAKA_BOT_ARGUMENTS[0]}" in
# CE devices only.
ce) WORKFLOW_ARGS+=( "browser_filter=Tizen ChromecastHub ChromecastUltra ChromecastGTV ChromeAndroid" ) ;;
ce) WORKFLOW_ARGS+=( "browser_filter=Tizen ChromecastHub ChromecastUltra ChromecastGTV ChromeAndroid ChromeOS" ) ;;

# No command argument, no extra workflow arguments.
"") ;;
Expand Down
2 changes: 0 additions & 2 deletions build/shaka-lab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,6 @@ ChromecastV1:
version: v1

ChromeOS:
# TODO(b/145916766): Persistent license tests failing
disabled: true
browser: chromeos
# https://www.acer.com/us-en/desktops-and-all-in-ones/acer-chromebox/acer-chromebox-cxi3/indexnew
version: Acer-CXI3
Expand Down
9 changes: 9 additions & 0 deletions lib/util/platform.js
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,15 @@ shaka.util.Platform = class {
return shaka.util.Platform.userAgentContains_('Fuchsia');
}

/**
* Return true if the platform is a ChromeOS, regardless of the browser.
*
* @return {boolean}
*/
static isChromeOS() {
return shaka.util.Platform.userAgentContains_('CrOS');
}

/**
* Return true if the platform is controlled by a remote control.
*
Expand Down
4 changes: 4 additions & 0 deletions test/offline/offline_integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ filterDescribe('Offline', supportsStorage, () => {
pending('Skipping offline DRM tests on Android - crbug.com/1108158');
return;
}
if (shaka.util.Platform.isChromeOS()) {
pending('Skipping offline DRM tests on ChromeOS');
return;
}

shaka.test.TestScheme.setupPlayer(player, 'sintel-enc');

Expand Down