Author: Richard Plangger <[email protected]>
Branch:
Changeset: r82961:3cab2735d806
Date: 2016-03-11 12:07 +0100
http://bitbucket.org/pypy/pypy/changeset/3cab2735d806/
Log: os.uname not avail. on windows (thx matti for pointing it out)
diff --git a/pypy/module/_vmprof/conftest.py b/pypy/module/_vmprof/conftest.py
--- a/pypy/module/_vmprof/conftest.py
+++ b/pypy/module/_vmprof/conftest.py
@@ -1,6 +1,6 @@
-import py, os
+import py, platform
def pytest_collect_directory(path, parent):
- if os.uname()[4] == 's390x':
+ if platform.machine() == 's390x':
py.test.skip("zarch tests skipped")
pytest_collect_file = pytest_collect_directory
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
