From 0852e84d9f27823e0cd40651bc3836b378c1239c Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 19 Oct 2012 15:59:29 +0200 Subject: [PATCH] skip pexpect using tests on freebsd --- CHANGELOG | 2 ++ _pytest/__init__.py | 2 +- _pytest/pytester.py | 2 ++ setup.py | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 763ffdbb4..42d7dc4fb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Changes between 2.3.0 and 2.3.dev ----------------------------------- +- skip pexpect using tests (test_pdb.py mostly) on freebsd* systems + due to pexpect not supporting it properly (hanging) Changes between 2.2.4 and 2.3.0 ----------------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 1025c98cb..9405eb038 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.3.0' +__version__ = '2.3.0.dev1' diff --git a/_pytest/pytester.py b/_pytest/pytester.py index 99d5244ed..d07c56040 100644 --- a/_pytest/pytester.py +++ b/_pytest/pytester.py @@ -532,6 +532,8 @@ class TmpTestdir: pytest.skip("pypy-64 bit not supported") if sys.platform == "darwin": pytest.xfail("pexpect does not work reliably on darwin?!") + if sys.platform.startswith("freebsd"): + pytest.xfail("pexpect does not work reliably on freebsd") logfile = self.tmpdir.join("spawn.out") child = pexpect.spawn(cmd, logfile=logfile.open("w")) child.timeout = expect_timeout diff --git a/setup.py b/setup.py index 0c7c48a00..ecd0435cb 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.3.0', + version='2.3.0.dev1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],