Add pytest header info & remove unused fixtures

vmuriart · vmuriart · commit da940f53920e · 2017-02-16T19:26:14.000-07:00
Fixtures came from a different project and I forgot to delete them.
Add custom header to gather environment info with test results.

Remove testdir from pythonpath. pytest handles this on conftest.py
diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,6 @@ environment:
   global:
     PYTHONUNBUFFERED: True
     PYTHONWARNINGS: 'ignore:::wheel.pep425tags:'
-    PYTHONPATH: C:\testdir
     CONDA_BLD: C:\miniconda35
 
   matrix:
@@ -34,11 +33,6 @@ init:
   # Prepend newly installed Python to the PATH of this build
   - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
 
-  # Check that we have the expected version, architecture for Python
-  - python --version
-  - python -c "import struct; print(struct.calcsize('P') * 8)"
-  - python -c "import ctypes; print(ctypes.sizeof(ctypes.c_wchar))"
-
 install:
   - pip install --upgrade -r requirements.txt
 
diff --git a/src/tests/conftest.py b/src/tests/conftest.py
@@ -1,57 +1,31 @@
 # -*- coding: utf-8 -*-
-# TODO: move tests one out of src. Pythonnet doesn't run...
+# TODO: move tests one out of src to project root.
+# TODO: travis has numpy on their workers. Maybe add tests?
 
 """Helpers for testing."""
 
-import io
-import os
+import ctypes
 import sys
+import sysconfig
 
-import pytest
 import clr
 
+# Add path for Python.Test & Add References
 sys.path.append('C:/testdir/')
 clr.AddReference("Python.Test")
 clr.AddReference("System.Collections")
 clr.AddReference("System.Data")
 
-DIR_PATH = os.path.dirname(__file__)
-FILES_DIR = os.path.join(DIR_PATH, 'files')
 
+def pytest_report_header(config):
+    """Generate extra report headers"""
+    # FIXME: https://github.com/pytest-dev/pytest/issues/2257
+    is_64bits = sys.maxsize > 2**32
+    arch = "x64" if is_64bits else "x86"
+    ucs = ctypes.sizeof(ctypes.c_wchar)
+    libdir = sysconfig.get_config_var("LIBDIR")
+    shared = bool(sysconfig.get_config_var("Py_ENABLE_SHARED"))
 
-@pytest.fixture()
-def filepath():
-    """Returns full file path for test files."""
-
-    def make_filepath(filename):
-        # http://stackoverflow.com/questions/18011902/parameter-to-a-fixture
-        # Alternate solution is to use paramtrization `inderect=True`
-        # http://stackoverflow.com/a/33879151
-        # Syntax is noisy and requires specific variable names
-        return os.path.join(FILES_DIR, filename)
-
-    return make_filepath
-
-
-@pytest.fixture()
-def load_file(filepath):
-    """Opens filename with encoding and return its contents."""
-
-    def make_load_file(filename, encoding='utf-8'):
-        # http://stackoverflow.com/questions/18011902/parameter-to-a-fixture
-        # Alternate solution is to use paramtrization `inderect=True`
-        # http://stackoverflow.com/a/33879151
-        # Syntax is noisy and requires specific variable names
-        # And seems to be limited to only 1 argument.
-        with io.open(filepath(filename), encoding=encoding) as f:
-            return f.read().strip()
-
-    return make_load_file
-
-
-@pytest.fixture()
-def get_stream(filepath):
-    def make_stream(filename, encoding='utf-8'):
-        return io.open(filepath(filename), encoding=encoding)
-
-    return make_stream
+    header = ("Arch: {arch}, UCS: {ucs}, LIBDIR: {libdir}, "
+              "Py_ENABLE_SHARED: {shared}".format(**locals()))
+    return header
