diff --git a/test/test_evaluate/extensions/README.rst b/test/test_evaluate/extensions/README.rst deleted file mode 100644 index 5f0b69ff..00000000 --- a/test/test_evaluate/extensions/README.rst +++ /dev/null @@ -1,10 +0,0 @@ -This directory contains pre-compiled extensions modules used to test completions -for compiled modules on Travis-CI (Ubuntu 12.04 64bit). - -To build the extensions modules, run:: - - python setup.py build_ext -i - - -Then move the compiled modules to their testing package ( ./**compiledXX**, where XX is the -python version used to run setup.py). \ No newline at end of file diff --git a/test/test_evaluate/extensions/compiled.pyx b/test/test_evaluate/extensions/compiled.pyx deleted file mode 100644 index 1e7c6907..00000000 --- a/test/test_evaluate/extensions/compiled.pyx +++ /dev/null @@ -1,6 +0,0 @@ -cdef class Foo: - pass - - -cdef class Bar: - pass diff --git a/test/test_evaluate/extensions/compiled27/__init__.py b/test/test_evaluate/extensions/compiled27/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_evaluate/extensions/compiled27/compiled.so b/test/test_evaluate/extensions/compiled27/compiled.so deleted file mode 100755 index becbfb56..00000000 Binary files a/test/test_evaluate/extensions/compiled27/compiled.so and /dev/null differ diff --git a/test/test_evaluate/extensions/compiled32/__init__.py b/test/test_evaluate/extensions/compiled32/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_evaluate/extensions/compiled32/compiled.so b/test/test_evaluate/extensions/compiled32/compiled.so deleted file mode 100755 index df34cfa0..00000000 Binary files a/test/test_evaluate/extensions/compiled32/compiled.so and /dev/null differ diff --git a/test/test_evaluate/extensions/setup.py b/test/test_evaluate/extensions/setup.py deleted file mode 100644 index a13237d2..00000000 --- a/test/test_evaluate/extensions/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -from distutils.core import setup -from Cython.Build import cythonize - -setup( - ext_modules=cythonize("compiled.pyx") -) diff --git a/test/test_evaluate/test_extension.py b/test/test_evaluate/test_extension.py index 2f198ea7..cf15b55c 100644 --- a/test/test_evaluate/test_extension.py +++ b/test/test_evaluate/test_extension.py @@ -2,41 +2,30 @@ Test compiled module """ import os -import platform -import sys + import jedi -from ..helpers import cwd_at - -@cwd_at('test/test_evaluate/extensions') def test_completions(): - if platform.architecture()[0] == '64bit': - package_name = "compiled%s%s" % sys.version_info[:2] - sys.path.insert(0, os.getcwd()) - if os.path.exists(package_name): - s = jedi.Script("from %s import compiled; compiled." % package_name) - assert len(s.completions()) >= 2 + s = jedi.Script('import _ctypes; _ctypes.') + assert len(s.completions()) >= 15 -@cwd_at('test/test_evaluate/extensions') def test_call_signatures_extension(): - # with a cython extension - if platform.architecture()[0] == '64bit': - package_name = "compiled%s%s" % sys.version_info[:2] - sys.path.insert(0, os.getcwd()) - if os.path.exists(package_name): - s = jedi.Script("from %s import compiled; compiled.Foo(" % - package_name) - defs = s.call_signatures() - for call_def in defs: - for param in call_def.params: - pass + if os.name == 'nt': + func = 'LoadLibrary' + params = 1 + else: + func = 'dlopen' + params = 2 + s = jedi.Script('import _ctypes; _ctypes.%s(' % (func,)) + sigs = s.call_signatures() + assert len(sigs) == 1 + assert len(sigs[0].params) == params def test_call_signatures_stdlib(): - code = "import math; math.cos(" - s = jedi.Script(code) - defs = s.call_signatures() - for call_def in defs: - assert len(call_def.params) == 1 + s = jedi.Script('import math; math.cos(') + sigs = s.call_signatures() + assert len(sigs) == 1 + assert len(sigs[0].params) == 1