summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-25Snap for 5333170 from 3a5218fcb8133b8d17a197b4fcd6c63bd11341d6 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsiandroid-build-team Robot
Change-Id: Icc4967f45947ab97225afadb2610340cbd40a804
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 4f9de24aaa -s ours am skip reason: subject contains skip directive Change-Id: Ibc15f44d024c83aac95ece1492b6cde30e995c63
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Ic2755603affbe971a1872fb2fe5d39a0bee6e5c9
2019-01-08Snap for 5214914 from 2365246c40d76386ee610d7ac28aae90208ffc1e to qt-releaseandroid-build-team Robot
Change-Id: I5ac59e999769b9f342cbdd6850d9f12b57fe636c
2019-01-07Add default active developers into OWNERS am: e5e8058dbc am: 0f7696e8e7Chih-Hung Hsieh
am: 9a4a5472fc Change-Id: I6c016e0a836a869cd602ea31a484ad697e688a63
2019-01-07Add default active developers into OWNERS am: e5e8058dbcChih-Hung Hsieh
am: 0f7696e8e7 Change-Id: I290cd27b6f3ab400b776481c5c30ce79fe9a7e6c
2019-01-07Add default active developers into OWNERSChih-Hung Hsieh
am: e5e8058dbc Change-Id: I89173700bc2b8db688c4c3325891ab149f42529a
2019-01-04Add default active developers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I13c385e2eb0b3c03d6adf9f75dc4cc56320fff1f
2018-09-25Snap for 5027604 from 226f4ba7b2a9fe6a403515780be42affbd4065c7 to qt-releaseandroid-build-team Robot
Change-Id: Id88c41dd064eb947e4eddd5f92f0a59e810cf5a1
2018-09-24Initial commit of mock 2.0.0 am: 824c5b747c am: b44695a467Kevin Cheng
am: 505c1c9366 Change-Id: I625cfb449c9e84909f8f5a10aea5ac5fab209a00
2018-09-24Initial commit of mock 2.0.0 am: 824c5b747cKevin Cheng
am: b44695a467 Change-Id: If43e32402d785525742802afda8d40c3f1fc95d2
2018-09-24Initial commit of mock 2.0.0android-wear-8.0.0_r2Kevin Cheng
am: 824c5b747c Change-Id: I273c7a76970a4ec734b5094a4ef45fab8e82e4c3
2018-09-21Initial commit of mock 2.0.0master-cuttlefish-testing-releaseKevin Cheng
Added in: - METADATA - Android.bp - NOTICE - MODULE_LICENSE_BSD Modified mock.py to not depend on pbr module, pbr was just used for versioning and since mock has not been modified in months (last commit was Jan 2018) I just hardcoded the version into mock.py instead. Merge commit '8c19ef6c95004524cb9f0b170a1aff6f47ade764' into import Bug: 112163440 Test: Built acloud-test with py-mock and was able to run successfully Change-Id: Iec384477c863178730f6e42cf67044eb80ec0ce1
2018-08-02Initial empty repositoryInna Palant
2018-01-09Merge pull request #415 from hugovk/rm-2.6Robert Collins
Drop support for EOL Python <= 2.6 & 3.0-3.2, add 3.5 & 3.6
2018-01-09Merge pull request #411 from hugovk/fix-typoRobert Collins
Github -> GitHub
2017-10-28Drop support for EOL Python <= 2.6 & 3.0-3.2, add 3.5 & 3.6Hugo
2017-10-09Github -> GitHubHugo
2016-12-12Merge pull request #376 from eli-b/patch-2Robert Collins
Remove dead code from __init__.py
2016-12-11Update version in header to 2.0.0Eli Boyarski
2016-09-26I am investigating a migration to Python 3, and to facilitate this we are ↵Roy Williams
using the -3 flag as decribed here: https://docs.python.org/3/howto/pyporting.html#prevent-compatibility-regressions . When using this flag I encountered some issues inside of mock itself. Python 3 now requires you to implement __hash__ if you implement __eq__. See https://docs.python.org/3.6/reference/datamodel.html#object.%5F%5Fhash%5F%5F . ```python {mock.ANY} # Fine in Python 2, Throws in Python 3 ``` This PR explicitly sets the `__hash__` method on these objects as `None` to ensure the behavior is consistent in Python 3 as well as Python 2.
2016-09-11Remove dead code from __init__.pyEli Boyarski
2016-04-06Fix #338: depend on a fixed version of funcsigs.Robert Collins
2016-04-04More 3.2 support dropping cleanup.Robert Collins
2016-03-23Update sync point.Robert Collins
Sem-Ver: feature
2016-03-23Add Mock.assert_called()Victor Stinner
Issue #26323: Add assert_called() and assert_called_once() methods to unittest.mock.Mock.
2016-03-23Issue25347 - Format the error message output of mock's assert_has_calls method.Senthil Kumaran
Patch contributed by Robert Zimmerman.
2016-03-23Issue #22138: Fix mock.patch behavior when patching descriptors. RestoreSenthil Kumaran
original values after patching. Patch contributed by Sean McCully.
2016-03-23Issue #24857: Comparing call_args to a long sequence now correctly returns aBerker Peksag
boolean result instead of raising an exception. Patch by A Kaptur.
2016-03-23Issue #23004: mock_open() now reads binary data correctly when the type of ↵Berker Peksag
read_data is bytes. Initial patch by Aaron Hill.
2016-03-21Add version info in the docslord63
2016-03-21Update six to a version with raises_fromFrankie Robertson
2016-03-21Fix #328 - handle unicode __repr__ on Python 2.xJoachim Jablon
2016-03-21Drop support for Python 3.2.Robert Collins
Pip 8 no longer supports 3.2, so we can't sensibly support it going forward - but folk can use an older Mock if they need 3.2 support.
2015-09-23Merge pull request #325 from lord63-forks/fix-typoBerker Peksag
Fix typo in docs/index.txt
2015-09-23Fix typo in docs/index.txtlord63
.travis.jml -> .travis.yml
2015-09-02Fix README.rst checking.Robert Collins
2015-08-04Be clearer about Python version compatRobert Collins
We support 2.6 again, but 2.5 etc are not supported.
2015-07-31Issue #295: use a setup_requires dependencyRobert Collins
Rather than hand-checking, let setuptools do the checking. This avoids issues with distutils being unable to parse some setuptools release versions, which could bite us in future.
2015-07-31Improve grouping of imports in tests.Robert Collins
2015-07-29Use six to detect python2/3 in main module.Michael Fladischer
2015-07-29Use six to detect python2/3 in test modules.Michael Fladischer
2015-07-24Update sync point.Robert Collins
2015-07-24Issue #21750: Further fixup to be styled like other mock APIs.Robert Collins
2015-07-24Typo fix in mock.patch.Robert Collins
Patch from https://github.com/testing-cabal/mock/issues/215
2015-07-18Revert "Issue #21750: mock_open.read_data can now be read from each ↵Robert Collins
instance, as it" This reverts commit e9db0161fc11eceba189a0cc161deefce57529a8. Issue #288 - mock_open.return_value.<stuff here> was a widely used pattern.
2015-07-17Add 2.6 back to classifiers.Robert Collins
2015-07-17Record sync point.Robert Collins
2015-07-17Issue #21750: mock_open.read_data can now be read from each instance, as itRobert Collins
could in Python 3.3.
2015-07-17Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.Robert Collins
Patch from Nicola Palumbo and Laurent De Buyst.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 16:58:48 +0000