Skip to content

Commit 7ca9d8a

Browse files
author
Jon Wayne Parrott
committed
Fixing nox travis session.
Change-Id: Ie431ad392f7c5aa5a8789b53e5d798c10d04295e
1 parent 0ec9fe6 commit 7ca9d8a

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

nox.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
'-x', '--no-success-flaky-report', '--cov', '--cov-config',
2626
'.coveragerc', '--cov-append', '--cov-report=']
2727

28-
SESSION_TESTS_BLACKLIST = set(('appengine', 'testing'))
28+
# Speech is temporarily disabled.
29+
SESSION_TESTS_BLACKLIST = set(('appengine', 'testing', 'speech'))
2930

3031

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

123124

124-
def session_travis(session):
125+
@nox.parametrize('subsession', ['gae', 'tests'])
126+
def session_travis(session, subsession):
125127
"""On travis, just run with python3.4 and don't run slow or flaky tests."""
126-
session_tests(
127-
session, 'python3.4', extra_pytest_args=['-m not slow and not flaky'])
128-
session_gae(
129-
session, extra_pytest_args=['-m not slow and not flaky'])
128+
if subsession == 'tests':
129+
session_tests(
130+
session,
131+
'python3.4',
132+
extra_pytest_args=['-m not slow and not flaky'])
133+
else:
134+
session_gae(
135+
session,
136+
extra_pytest_args=['-m not slow and not flaky'])

storage/api/customer_supplied_keys_test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
import re
1515

1616
from customer_supplied_keys import main
17+
from gcp.testing.flaky import flaky
1718

1819

20+
@flaky
1921
def test_main(cloud_config, capsys):
2022
main(cloud_config.storage_bucket, __file__)
2123
out, err = capsys.readouterr()

0 commit comments

Comments
 (0)