Skip to content

Commit

Permalink
test: Run DRM tests by default (shaka-project#4174)
Browse files Browse the repository at this point in the history
This changes the default behavior of the test runner.  Now tests that
require access to license servers will run by default.  To disable DRM
tests (for example, if there is no connection to the outside
internet), use --no-drm.
  • Loading branch information
joeyparrish authored Apr 29, 2022
1 parent d51fe23 commit 0d95aea
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ jobs:
python build/test.py \
--browsers "$browser" \
--reporters spec --spec-hide-passed \
--drm \
${{ matrix.extra_flags }}
build_in_docker:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/selenium-lab-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ jobs:
run: |
python3 build/test.py \
--reporters spec --spec-hide-passed \
--drm \
--lets-encrypt-folder /etc/shakalab.rocks \
--hostname karma.shakalab.rocks \
--port 61731 \
Expand Down
4 changes: 2 additions & 2 deletions build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ directly:
* `--external` will run integration tests against external assets. This will
take an extremely long time to run, and requires a fast and reliable internet
connection.
* `--drm` will run integration tests against DRM license servers. This will
require a connection to the open internet.
* `--no-drm` will skip integration tests against DRM license servers. Not
specifying this flag requires a connection to the open internet.
* `--uncompiled` will run integration tests using the uncompiled library instead
of the compiled version.
* `--random` will run the tests in a random order to isolate test dependencies.
Expand Down
8 changes: 7 additions & 1 deletion build/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,14 @@ def __init__(self, description):
action='store_true')
running_commands.add_argument(
'--drm',
help='Run tests that require DRM.',
help='Run tests that require DRM (on by default).',
default=True,
action='store_true')
running_commands.add_argument(
'--no-drm', '--nodrm',
help='Skip tests that require DRM (opposite of --drm).',
dest='drm',
action='store_false')
running_commands.add_argument(
'--quarantined',
help='Run tests that have been quarantined.',
Expand Down

0 comments on commit 0d95aea

Please sign in to comment.