Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
merge origin/master
  • Loading branch information
shihai1991 committed Aug 4, 2020
commit 0a6fb70bfad9f3c5927978797a32a3c6b77308dd
2 changes: 1 addition & 1 deletion Lib/test/test_mmap.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from test.support import requires, _2G, _4G, gc_collect, cpython_only
from test.support import (requires, _2G, _4G, gc_collect, cpython_only)
from test.support.import_helper import import_module
from test.support.os_helper import TESTFN, unlink
import unittest
Expand Down
4 changes: 2 additions & 2 deletions Lib/unittest/test/test_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,8 @@ def __init__(self, stream=None, descriptions=None, verbosity=None):
class Test_OldTestResult(unittest.TestCase):

def assertOldResultWarning(self, test, failures):
with warnings_helper.check_warnings(("TestResult has no add.+ method,",
RuntimeWarning)):
with warnings_helper.check_warnings(
("TestResult has no add.+ method,", RuntimeWarning)):
result = OldResult()
test.run(result)
self.assertEqual(len(result.failures), failures)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.