Skip to content

Some fixes for Python 3 #23669

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

Closed
cclauss wants to merge 5 commits into from
Closed

Some fixes for Python 3 #23669

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
897025c
Some fixes for Python 3
Oct 15, 2018
ee94a08
Merge branch 'master' into some-Python3-fixes
Oct 21, 2018
c26261d
No noqa
Oct 23, 2018
78c664d
No noqa
Oct 23, 2018
6327303
No noqa
Oct 23, 2018
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
Prev Previous commit
Next Next commit
Merge branch 'master' into some-Python3-fixes
  • Loading branch information
cclauss authored Oct 21, 2018
commit ee94a08e8e380759f713879d361338bacfa199f1
17 changes: 2 additions & 15 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,8 +1422,8 @@ def ProcessOptions(options):
# tends to exaggerate the number of available cpus/cores.
cores = os.environ.get('JOBS')
options.j = int(cores) if cores is not None else multiprocessing.cpu_count()
if options.flaky_tests not in ["run", "skip", "dontcare"]:
print("Unknown flaky-tests mode %s" % options.flaky_tests)
if options.flaky_tests not in [RUN, SKIP, DONTCARE]:
print "Unknown flaky-tests mode %s" % options.flaky_tests
return False
return True

Expand All @@ -1436,19 +1436,6 @@ def ProcessOptions(options):
* %(fail)4d tests are expected to fail that we should fix\
"""

def PrintReport(cases):
def IsFailOk(o):
return (len(o) == 2) and (FAIL in o) and (OKAY in o)
unskipped = [c for c in cases if not SKIP in c.outcomes]
print(REPORT_TEMPLATE % {
'total': len(cases),
'skipped': len(cases) - len(unskipped),
'pass': len([t for t in unskipped if list(t.outcomes) == [PASS]]),
'fail_ok': len([t for t in unskipped if IsFailOk(t.outcomes)]),
'fail': len([t for t in unskipped if list(t.outcomes) == [FAIL]])
})


class Pattern(object):

def __init__(self, pattern):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.