Skip to content

Fixing nox travis session. #290

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 27, 2016
Merged

Fixing nox travis session. #290

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
7ca9d8a
Fixing nox travis session.
Apr 27, 2016
7882d43
Merge branch 'master' into fix-nos
Apr 27, 2016
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
19 changes: 13 additions & 6 deletions nox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
'-x', '--no-success-flaky-report', '--cov', '--cov-config',
'.coveragerc', '--cov-append', '--cov-report=']

SESSION_TESTS_BLACKLIST = set(('appengine', 'testing'))
# Speech is temporarily disabled.
SESSION_TESTS_BLACKLIST = set(('appengine', 'testing', 'speech'))


def session_lint(session):
Expand Down Expand Up @@ -121,9 +122,15 @@ def session_gae(session, extra_pytest_args=None):
success_codes=[0, 5]) # Treat no test collected as success.


def session_travis(session):
@nox.parametrize('subsession', ['gae', 'tests'])
def session_travis(session, subsession):
"""On travis, just run with python3.4 and don't run slow or flaky tests."""
session_tests(
session, 'python3.4', extra_pytest_args=['-m not slow and not flaky'])
session_gae(
session, extra_pytest_args=['-m not slow and not flaky'])
if subsession == 'tests':
session_tests(
session,
'python3.4',
extra_pytest_args=['-m not slow and not flaky'])
else:
session_gae(
session,
extra_pytest_args=['-m not slow and not flaky'])
2 changes: 2 additions & 0 deletions storage/api/customer_supplied_keys_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
import re

from customer_supplied_keys import main
from gcp.testing.flaky import flaky


@flaky
def test_main(cloud_config, capsys):
main(cloud_config.storage_bucket, __file__)
out, err = capsys.readouterr()
Expand Down