Author: Armin Rigo <[email protected]>
Branch:
Changeset: r65098:839b05ae6bb9
Date: 2013-06-29 17:19 +0200
http://bitbucket.org/pypy/pypy/changeset/839b05ae6bb9/
Log: Fix the tests
diff --git a/pypy/module/test_lib_pypy/test_ctypes_config_cache.py
b/pypy/module/test_lib_pypy/test_ctypes_config_cache.py
--- a/pypy/module/test_lib_pypy/test_ctypes_config_cache.py
+++ b/pypy/module/test_lib_pypy/test_ctypes_config_cache.py
@@ -32,14 +32,6 @@
return d
-def test_syslog():
- try:
- import lib_pypy.syslog
- except ImportError:
- py.test.skip('no syslog on this platform')
- d = run('syslog.ctc.py', '_syslog_cache.py')
- assert 'LOG_NOTICE' in d
-
def test_resource():
try:
import lib_pypy.resource
diff --git a/pypy/module/test_lib_pypy/test_grp_extra.py
b/pypy/module/test_lib_pypy/test_grp_extra.py
--- a/pypy/module/test_lib_pypy/test_grp_extra.py
+++ b/pypy/module/test_lib_pypy/test_grp_extra.py
@@ -8,7 +8,7 @@
def test_basic():
g = grp.getgrnam("root")
assert g.gr_gid == 0
- assert g.gr_mem == ['root']
+ assert g.gr_mem == ['root'] or g.gr_mem == []
assert g.gr_name == 'root'
assert isinstance(g.gr_passwd, str) # usually just 'x', don't hope :-)
diff --git a/pypy/module/test_lib_pypy/test_syslog.py
b/pypy/module/test_lib_pypy/test_syslog.py
--- a/pypy/module/test_lib_pypy/test_syslog.py
+++ b/pypy/module/test_lib_pypy/test_syslog.py
@@ -1,9 +1,13 @@
from __future__ import absolute_import
-import py
+import sys, py
try:
from lib_pypy import syslog
except ImportError:
py.test.skip('no syslog on this platform')
+except AssertionError:
+ if '__pypy__' in sys.builtin_module_names:
+ raise
+ py.test.skip('AssertionError during import (wrong cffi version?)')
# XXX very minimal test
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
