aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...HEADmasterXin Li2020-04-100-0/+0
|\
| * DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li2020-04-090-0/+0
| |\
| | * DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| | |\ | | |/ | |/|
* | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
|\| |
| * | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\|
| | * Revert "Upgrade python/mock to 4.0.2" am: 3381fde741 am: 276f8d6022Automerger Merge Worker2020-03-1330-2664/+961
| | |\ | | |/ | |/|
| | * Upgrade python/mock to 4.0.2 am: 73ebb2ed5b am: f5ce53b581Automerger Merge Worker2020-03-1230-961/+2664
| | |\
* | | | Revert "Upgrade python/mock to 4.0.2" am: 3381fde741 am: 276f8d6022Automerger Merge Worker2020-03-1330-2664/+961
|\| | |
| * | | Revert "Upgrade python/mock to 4.0.2" am: 3381fde741Automerger Merge Worker2020-03-1330-2664/+961
| |\ \ \ | | |_|/ | |/| |
| | * | Revert "Upgrade python/mock to 4.0.2"android-r-preview-4android-r-preview-3android-r-preview-2Herbert Xue2020-03-1330-2664/+961
* | | | Upgrade python/mock to 4.0.2 am: 73ebb2ed5b am: f5ce53b581Automerger Merge Worker2020-03-1230-961/+2664
|\| | |
| * | | Upgrade python/mock to 4.0.2 am: 73ebb2ed5bAutomerger Merge Worker2020-03-1230-961/+2664
| |\| | | | |/ | |/|
| | * Upgrade python/mock to 4.0.2Haibo Huang2020-03-1230-961/+2664
| |/|
| | * Add intersphinx.Chris Withers2020-03-111-1/+7
| | * Preparing for 4.0.2 release.Chris Withers2020-03-113-5/+9
| | * latest sync pointChris Withers2020-03-111-1/+1
| | * bpo-39915: Ensure await_args_list is updated according to the order in which ...Karthikeyan Singaravelan2020-03-113-1/+16
| | * Remove universal wheel tag and prepare for a 4.0.1 releaseChris Withers2020-02-063-4/+6
| | * Prepare for 4.0.0 releaseChris Withers2020-02-052-1/+6
| | * *sigh*Chris Withers2020-01-291-0/+1
| | * this skip is no longer neededChris Withers2020-01-291-2/+0
| | * *sigh*Chris Withers2020-01-291-1/+1
| | * another packaging test bugfixChris Withers2020-01-291-1/+0
| | * paranoid packaging check for 3.6Chris Withers2020-01-291-1/+8
| | * fixup: package checksChris Withers2020-01-291-7/+1
| | * Merge pull request #476 from cjw296/restart_for_4Chris Withers2020-01-2928-949/+2620
| | |\
| | | * Preparing for 4.1.0 release.Chris Withers2020-01-2925-59/+105
| | | * ReST bugfixChris Withers2020-01-291-1/+1
| | | * another code coverage patternChris Withers2020-01-291-0/+14
| | | * bug fix on committing changed version fileChris Withers2020-01-291-1/+1
| | | * fixup: point sphinx conf at new version locationChris Withers2020-01-291-1/+1
| | | * latest sync pointChris Withers2020-01-291-1/+1
| | | * bpo-37972: unittest.mock._Call now passes on __getitem__ to the __getattr__ c...blhsing2020-01-293-0/+31
| | | * Get mock coverage back to 100% (GH-18228)Chris Withers2020-01-294-54/+35
| | | * bpo-39485: fix corner-case in method-detection of mock (GH-18252)Carl Friedrich Bolz-Tereick2020-01-292-5/+4
| | | * instructions for running coverage on cpython's mock packageChris Withers2020-01-291-2/+22
| | | * ignore empty yield methods tooChris Withers2020-01-291-0/+1
| | | * fixup: uncache backportChris Withers2020-01-291-7/+2
| | | * fixup: simplify IsolatedAsyncioTestCase backportChris Withers2020-01-291-12/+1
| | | * Clarify and fix assertions that mocks have not been awaited (GH-18196)Chris Withers2020-01-292-25/+31
| | | * Backports: c7dd3c7d87d6961756d99b57aa13db7c7a03e1f8, skipped: already appliedChris Withers2020-01-291-1/+1
| | | * bpo-25597: Ensure wraps' return value is used for magic methods in MagicMock ...Karthikeyan Singaravelan2020-01-293-0/+56
| | | * bpo-38932: Mock fully resets child objects on reset_mock(). (GH-17409)Vegard Stikbakke2020-01-293-2/+15
| | | * bpo-37955: correct mock.patch docs with respect to the returned type (GH-15521)Paulo Henrique Silva2020-01-291-1/+2
| | | * bpo-39082: Allow AsyncMock to correctly patch static/class methods (GH-18116)Matthew Kokotovich2020-01-293-0/+26
| | | * move testasync to backports.iscoroutinefunction to keep inline with upstream ...Chris Withers2020-01-291-18/+18
| | | * pypy actually gets this right, so make it clear in the testChris Withers2020-01-291-4/+7
| | | * this one no longer fails on pypyChris Withers2020-01-291-2/+0
| | | * flip more to iscoroutinefunction backportChris Withers2020-01-291-4/+4
| | | * bpo-38473: Handle autospecced functions and methods used with attach_mock (GH...Karthikeyan Singaravelan2020-01-293-0/+35