Merge remote-tracking branch 'andrej2704/master'

Conflicts:
	README.md

Resolved
This commit is contained in:
Vinta 2014-08-07 09:45:40 +08:00
commit abff3e563b

View File

@ -741,6 +741,7 @@ A curated list of awesome Python frameworks, libraries and software. Inspired by
* [doublex](https://pypi.python.org/pypi/doublex) - Powerful test doubles framework for Python. * [doublex](https://pypi.python.org/pypi/doublex) - Powerful test doubles framework for Python.
* [freezegun](https://github.com/spulec/freezegun) - Travel through time by mocking the datetime module. * [freezegun](https://github.com/spulec/freezegun) - Travel through time by mocking the datetime module.
* [httpretty](http://falcao.it/HTTPretty/) - HTTP request mock tool for Python. * [httpretty](http://falcao.it/HTTPretty/) - HTTP request mock tool for Python.
* [httmock](https://github.com/patrys/httmock) - A mocking library for requests for Python 2.6+ and 3.2+.
* Fake Data * Fake Data
* [faker](http://www.joke2k.net/faker/) - A Python package that generates fake data. * [faker](http://www.joke2k.net/faker/) - A Python package that generates fake data.
* [mixer](https://mixer.readthedocs.org) - Generating fake data and creating random fixtures for testing in Django ORM, SQLAlchemy, Peewee, MongoEngine, Pony ORM and etc. * [mixer](https://mixer.readthedocs.org) - Generating fake data and creating random fixtures for testing in Django ORM, SQLAlchemy, Peewee, MongoEngine, Pony ORM and etc.