3 new commits in pytest:
https://bitbucket.org/hpk42/pytest/commits/b1c669731469/
Changeset: b1c669731469
User: dangra
Date: 2014-03-28 03:57:18
Summary: no need for im_func and it does not exists in python3
Affected #: 1 file
diff -r 5ae1d4e50c635e3512be6cc8c16314251328d252 -r
b1c669731469d67efd4419cfc6863162bb6ae11e _pytest/unittest.py
--- a/_pytest/unittest.py
+++ b/_pytest/unittest.py
@@ -154,7 +154,7 @@
if isinstance(item, TestCaseFunction):
if 'twisted.trial.unittest' in sys.modules:
ut = sys.modules['twisted.python.failure']
- Failure__init__ = ut.Failure.__init__.im_func
+ Failure__init__ = ut.Failure.__init__
check_testcase_implements_trial_reporter()
def excstore(self, exc_value=None, exc_type=None, exc_tb=None,
captureVars=None):
https://bitbucket.org/hpk42/pytest/commits/6fa555178c17/
Changeset: 6fa555178c17
User: dangra
Date: 2014-03-28 14:44:51
Summary: add py33-trial tox environment
Affected #: 1 file
diff -r b1c669731469d67efd4419cfc6863162bb6ae11e -r
6fa555178c17d485f18cc54f4a5947486266841d tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
distshare={homedir}/.tox/distshare
-envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,trial
+envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,py27-trial,py33-trial
[testenv]
changedir=testing
@@ -61,12 +61,22 @@
py.test -n3 -rfsxX \
--junitxml={envlogdir}/junit-{envname}.xml {posargs:testing}
-[testenv:trial]
+[testenv:py27-trial]
changedir=.
+basepython=python2.7
deps=twisted
commands=
py.test -rsxf \
--junitxml={envlogdir}/junit-{envname}.xml
{posargs:testing/test_unittest.py}
+
+[testenv:py33-trial]
+changedir=.
+basepython=python3.3
+deps={[testenv:py27-trial]deps}
+commands=
+ py.test -rsxf \
+ --junitxml={envlogdir}/junit-{envname}.xml
{posargs:testing/test_unittest.py}
+
[testenv:doctest]
changedir=.
commands=py.test --doctest-modules _pytest
https://bitbucket.org/hpk42/pytest/commits/fe460df3ae11/
Changeset: fe460df3ae11
User: hpk42
Date: 2014-03-28 14:46:34
Summary: Merged in dangra/pytest (pull request #132)
no need for im_func and it does not exists in python3
Affected #: 2 files
diff -r 3f7abe3da42704c757ea437f14bd8caf5b8f04c7 -r
fe460df3ae1144ac4239cef0b5203d5040776bed _pytest/unittest.py
--- a/_pytest/unittest.py
+++ b/_pytest/unittest.py
@@ -154,7 +154,7 @@
if isinstance(item, TestCaseFunction):
if 'twisted.trial.unittest' in sys.modules:
ut = sys.modules['twisted.python.failure']
- Failure__init__ = ut.Failure.__init__.im_func
+ Failure__init__ = ut.Failure.__init__
check_testcase_implements_trial_reporter()
def excstore(self, exc_value=None, exc_type=None, exc_tb=None,
captureVars=None):
diff -r 3f7abe3da42704c757ea437f14bd8caf5b8f04c7 -r
fe460df3ae1144ac4239cef0b5203d5040776bed tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
distshare={homedir}/.tox/distshare
-envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,trial
+envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,py27-trial,py33-trial
[testenv]
changedir=testing
@@ -61,12 +61,22 @@
py.test -n3 -rfsxX \
--junitxml={envlogdir}/junit-{envname}.xml {posargs:testing}
-[testenv:trial]
+[testenv:py27-trial]
changedir=.
+basepython=python2.7
deps=twisted
commands=
py.test -rsxf \
--junitxml={envlogdir}/junit-{envname}.xml
{posargs:testing/test_unittest.py}
+
+[testenv:py33-trial]
+changedir=.
+basepython=python3.3
+deps={[testenv:py27-trial]deps}
+commands=
+ py.test -rsxf \
+ --junitxml={envlogdir}/junit-{envname}.xml
{posargs:testing/test_unittest.py}
+
[testenv:doctest]
changedir=.
commands=py.test --doctest-modules _pytest
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pytest-commit
