2 new commits in pytest: https://bitbucket.org/hpk42/pytest/commits/f6c8dfaf05d6/ Changeset: f6c8dfaf05d6 Branch: ignore-autocomplete-on-darwin User: bubenkoff Date: 2013-11-12 13:52:16 Summary: ignore argcomplete on darwin Affected #: 1 file
diff -r 257206079babf818a2819a44f5cf30c64d572287 -r f6c8dfaf05d655f4cd2948fdedcc86753d8e144a testing/test_argcomplete.py --- a/testing/test_argcomplete.py +++ b/testing/test_argcomplete.py @@ -72,7 +72,7 @@ # the following barfs with a syntax error on py2.5 # @pytest.mark.skipif("sys.version_info < (2,6)") class TestArgComplete: - @pytest.mark.skipif("sys.platform == 'win32'") + @pytest.mark.skipif("sys.platform in ('win32', 'darwin')") @pytest.mark.skipif("sys.version_info < (2,6)") def test_compare_with_compgen(self): from _pytest._argcomplete import FastFilesCompleter @@ -81,7 +81,7 @@ for x in '/ /d /data qqq'.split(): assert equal_with_bash(x, ffc, fc, out=py.std.sys.stdout) - @pytest.mark.skipif("sys.platform == 'win32'") + @pytest.mark.skipif("sys.platform in ('win32', 'darwin')") @pytest.mark.skipif("sys.version_info < (2,6)") def test_remove_dir_prefix(self): """this is not compatible with compgen but it is with bash itself: https://bitbucket.org/hpk42/pytest/commits/8ebe029cde4d/ Changeset: 8ebe029cde4d User: hpk42 Date: 2013-11-13 07:44:24 Summary: Merged in paylogic/pytest/ignore-autocomplete-on-darwin (pull request #84) ignore argcomplete on darwin Affected #: 1 file diff -r 157241084b314d9b1f69b92e0d51ca4b67d1cf0a -r 8ebe029cde4d67b822bbb8b4ffe1f896498e29e2 testing/test_argcomplete.py --- a/testing/test_argcomplete.py +++ b/testing/test_argcomplete.py @@ -72,7 +72,7 @@ # the following barfs with a syntax error on py2.5 # @pytest.mark.skipif("sys.version_info < (2,6)") class TestArgComplete: - @pytest.mark.skipif("sys.platform == 'win32'") + @pytest.mark.skipif("sys.platform in ('win32', 'darwin')") @pytest.mark.skipif("sys.version_info < (2,6)") def test_compare_with_compgen(self): from _pytest._argcomplete import FastFilesCompleter @@ -81,7 +81,7 @@ for x in '/ /d /data qqq'.split(): assert equal_with_bash(x, ffc, fc, out=py.std.sys.stdout) - @pytest.mark.skipif("sys.platform == 'win32'") + @pytest.mark.skipif("sys.platform in ('win32', 'darwin')") @pytest.mark.skipif("sys.version_info < (2,6)") def test_remove_dir_prefix(self): """this is not compatible with compgen but it is with bash itself: 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 pytest-commit@python.org https://mail.python.org/mailman/listinfo/pytest-commit