Skip to content

Commit

Permalink
Use mock trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
calvinchengx committed Feb 20, 2012
1 parent 9e9df65 commit 5f551e9
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CHANGELOG
=========


2012/XX/XX Version 0.8.0
2012/02/13 Version 0.8.0
------------------------

The only changes since 0.8rc2 are:
Expand Down
4 changes: 2 additions & 2 deletions docs/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:Author: `Michael Foord
<http://www.voidspace.org.uk/python/weblog/index.shtml>`_
:Version: |release|
:Date: 2012/XX/XX
:Date: 2012/02/13
:Homepage: `Mock Homepage`_
:Download: `Mock on PyPI`_
:Documentation: `PDF Documentation
Expand Down Expand Up @@ -294,7 +294,7 @@ the `__call__` method.
References
==========

Articles and blog entries on testing with Mock:
Articles, blog entries and other stuff related to testing with Mock:

* `mock-django: tools for mocking the Django ORM and models
<https://github.com/dcramer/mock-django>`_
Expand Down
1 change: 1 addition & 0 deletions extendmock.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# merged into mock.py in Mock 0.7
4 changes: 2 additions & 2 deletions mock.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2007-2012 Michael Foord & the mock team
# E-mail: fuzzyman AT voidspace DOT org DOT uk

# mock 0.8.0
# mock 0.9.0
# http://www.voidspace.org.uk/python/mock/

# Released subject to the BSD License
Expand All @@ -29,7 +29,7 @@
)


__version__ = '0.8.0'
__version__ = '0.9.0alpha1'


import pprint
Expand Down
26 changes: 26 additions & 0 deletions mock.wpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!wing
#!version=4.0
##################################################################
# Wing IDE project file #
##################################################################
[project attributes]
proj.directory-list = [{'dirloc': loc('.'),
'excludes': [u'latex',
u'.hg',
u'.tox',
u'dist',
u'htmlcov',
u'extendmock.py',
u'__pycache__',
u'html',
u'build',
u'mock.egg-info',
u'tests/__pycache__',
u'.hgignore',
u'.hgtags'],
'filter': '*',
'include_hidden': 0,
'recursive': 1,
'watch_for_changes': 1}]
proj.file-type = 'shared'
testing.auto-test-file-specs = ('test*.py',)
11 changes: 2 additions & 9 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
[build_sphinx]
source-dir = docs
build-dir = html

source-dir=docs
build-dir=html
[sdist]
force-manifest = 1

[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0

95 changes: 95 additions & 0 deletions unittest.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@

[unittest]
plugins =
unittest2.plugins.debugger
unittest2.plugins.checker
unittest2.plugins.doctestloader
unittest2.plugins.matchregexp
unittest2.plugins.moduleloading
unittest2.plugins.testcoverage
unittest2.plugins.growl
unittest2.plugins.filtertests
unittest2.plugins.junitxml
unittest2.plugins.timed
unittest2.plugins.counttests
unittest2.plugins.logchannels

excluded-plugins =

# 0, 1 or 2 (default is 1)
# quiet, normal or verbose
# can be overriden at command line
verbosity = normal

# true or false
# even if false can be switched on at command line
catch =
buffer =
failfast =


[matchregexp]
always-on = False
full-path = True

[debugger]
always-on = False
errors-only = True

[coverage]
always-on = False
config =
report-html = False
# only used if report-html is false
annotate = False
# defaults to './htmlcov/'
html-directory =
# if unset will output to console
text-file =
branch = False
timid = False
cover-pylib = False
exclude-lines =
# Have to re-enable the standard pragma
pragma: no cover

# Don't complain about missing debug-only code:
def __repr__
if self\.debug

# Don't complain if tests don't hit defensive assertion code:
raise AssertionError
raise NotImplementedError

# Don't complain if non-runnable code isn't run:
if 0:
if __name__ == .__main__.

ignore-errors = False
modules =

[growl]
always-on = False

[doctest]
always-on = False

[module-loading]
always-on = False

[checker]
always-on = False
pep8 = False
pyflakes = True

[junit-xml]
always-on = False
path = junit.xml

[timed]
always-on = True
threshold = 0.01

[count]
always-on = True
enhanced = False

0 comments on commit 5f551e9

Please sign in to comment.