From c546655dc29086895538be92377a82f64a834c1f Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Mon, 31 Oct 2016 13:54:43 +0000 Subject: [PATCH] Use pytest fixtures in numpy dtypes test module --- tests/test_numpy_dtypes.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py index c0d6ec29..2ef6f4d0 100644 --- a/tests/test_numpy_dtypes.py +++ b/tests/test_numpy_dtypes.py @@ -1,11 +1,20 @@ +import re import pytest + with pytest.suppress(ImportError): import numpy as np - simple_dtype = np.dtype({'names': ['x', 'y', 'z'], - 'formats': ['?', 'u4', 'f4'], - 'offsets': [0, 4, 8]}) - packed_dtype = np.dtype([('x', '?'), ('y', 'u4'), ('z', 'f4')]) + +@pytest.fixture(scope='module') +def simple_dtype(): + return np.dtype({'names': ['x', 'y', 'z'], + 'formats': ['?', 'u4', 'f4'], + 'offsets': [0, 4, 8]}) + + +@pytest.fixture(scope='module') +def packed_dtype(): + return np.dtype([('x', '?'), ('y', 'u4'), ('z', 'f4')]) def assert_equal(actual, expected_data, expected_dtype): @@ -32,7 +41,7 @@ def test_format_descriptors(): @pytest.requires_numpy -def test_dtype(): +def test_dtype(simple_dtype): from pybind11_tests import print_dtypes, test_dtype_ctors, test_dtype_methods assert print_dtypes() == [ @@ -57,7 +66,7 @@ def test_dtype(): @pytest.requires_numpy -def test_recarray(): +def test_recarray(simple_dtype, packed_dtype): from pybind11_tests import (create_rec_simple, create_rec_packed, create_rec_nested, print_rec_simple, print_rec_packed, print_rec_nested, create_rec_partial, create_rec_partial_nested)