fix test

2 files changed, 10 insertions, 9 deletions

diff --git a/psutil/_psutil_common.c b/psutil/_psutil_common.c
index e3ff45ed..a01919d5 100644
--- a/psutil/_psutil_common.c
+++ b/psutil/_psutil_common.c
@@ -64,7 +64,7 @@ error:
 #if !defined(PyErr_SetFromWindowsErr)
 PyObject *
 PyErr_SetFromWindowsErr(int winerr) {
-    return PyErr_SetFromWindowsErrWithFilename(winerr);
+    return PyErr_SetFromWindowsErrWithFilename(winerr, "");
 }
 #endif  // !defined(PyErr_SetFromWindowsErr)
 #endif  // defined(PSUTIL_WINDOWS) && defined(PYPY_VERSION)
diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
index 8a17ff9b..62ffbfec 100755
--- a/psutil/tests/test_contracts.py
+++ b/psutil/tests/test_contracts.py
@@ -376,14 +376,15 @@ def proc_info(pid):
     name, ppid = d['name'], d['ppid']
     info = {'pid': proc.pid}
     ns = process_namespace(proc)
-    with proc.oneshot():
-        for fun, fun_name in ns.iter(ns.getters, clear_cache=False):
-            try:
-                info[fun_name] = fun()
-            except psutil.Error as exc:
-                check_exception(exc, proc, name, ppid)
-                continue
-        do_wait()
+    # We don't use oneshot() because in order not to fool
+    # check_exception() in case of NSP.
+    for fun, fun_name in ns.iter(ns.getters, clear_cache=False):
+        try:
+            info[fun_name] = fun()
+        except psutil.Error as exc:
+            check_exception(exc, proc, name, ppid)
+            continue
+    do_wait()
     return info