From efafaff0dee2c551d474470966d5cb3d3f32bcb9 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Fri, 10 Aug 2018 00:33:20 -0500
Subject: [PATCH] Minor test suite fixes

---
 test/test_array.py   | 3 ++-
 test/test_wrapper.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/test_array.py b/test/test_array.py
index bca78f5c..bfdd10e6 100644
--- a/test/test_array.py
+++ b/test/test_array.py
@@ -37,10 +37,11 @@ import pyopencl.tools as cl_tools
 from pyopencl.tools import (  # noqa
         pytest_generate_tests_for_pyopencl as pytest_generate_tests)
 from pyopencl.characterize import has_double_support, has_struct_arg_count_bug
-from pyopencl.cffi_cl import _PYPY
 
 from pyopencl.clrandom import RanluxGenerator, PhiloxGenerator, ThreefryGenerator
 
+_PYPY = cl._PYPY
+
 
 # {{{ helpers
 
diff --git a/test/test_wrapper.py b/test/test_wrapper.py
index 118eee74..efb86006 100644
--- a/test/test_wrapper.py
+++ b/test/test_wrapper.py
@@ -295,7 +295,7 @@ def test_image_format_constructor():
 
     assert iform.channel_order == cl.channel_order.RGBA
     assert iform.channel_data_type == cl.channel_type.FLOAT
-    assert not iform.__dict__
+    assert not hasattr(iform, "__dict__")
 
 
 def test_device_topology_amd_constructor():
-- 
GitLab