python-control
diff --git a/‎control/tests/conftest.py
Lines changed: 20 additions & 5 deletions b/‎control/tests/conftest.py
Lines changed: 20 additions & 5 deletions
diff --git a/‎control/tests/modelsimp_array_test.py
Lines changed: 1 addition & 1 deletion b/‎control/tests/modelsimp_array_test.py
Lines changed: 1 addition & 1 deletion
@@ -20,21 +20,28 @@
 
 
 @pytest.fixture(scope="session", autouse=test_ndarray,
-                params=["array", "matrix"])
-def use_numpy_ndarray_and_matrix(request):
-    """Switch the config to use np.ndarray or np.matrix"""
+                params=["arrayout", "matrixout"])
+def matarrayout(request):
+    """Switch the config to use np.ndarray and np.matrix as returns"""
     restore = control.config.defaults['statesp.use_numpy_matrix']
-    control.use_numpy_matrix(request.param == "matrix", warn=False)
+    control.use_numpy_matrix(request.param == "matrixout", warn=False)
     yield
     control.use_numpy_matrix(restore, warn=False)
 
 
-def is_matrix_or_array(obj):
+def ismatarrayout(obj):
     """Test if the returned object has the correct type as configured"""
     use_matrix = control.config.defaults['statesp.use_numpy_matrix']
     return isinstance(obj, np.matrix if use_matrix else np.ndarray)
 
 
+def asmatarrayout(obj):
+    """Return a object according to the configured default"""
+    use_matrix = control.config.defaults['statesp.use_numpy_matrix']
+    matarray = np.asmatrix if use_matrix else np.asarray
+    return matarray(obj)
+
+
 @contextmanager
 def check_deprecated_matrix():
     """Check that a call produces a deprecation warning because of np.matrix"""
@@ -49,6 +56,14 @@ def check_deprecated_matrix():
         yield
 
 
+@pytest.fixture(scope="session",
+                params=[np.array, np.matrix] if test_ndarray else [np.array],
+                ids=["arrayin", "matrixin"] if test_ndarray else ["arrayin"])
+def matarrayin(request):
+    """Use array and matrix to construct input data in tests"""
+    return request.param
+
+
 @pytest.fixture(scope="function")
 def editsdefaults():
     """Make sure any changes to the defaults only last during a test"""
 
@@ -16,7 +16,7 @@ class TestModelsimp:
     """Test model reduction functions"""
 
     @slycotonly
-    def testHSVD(self, use_numpy_ndarray_and_matrix):
+    def testHSVD(self, matarrayout):
         A = np.array([[1., -2.], [3., -4.]])
         B = np.array([[5.], [7.]])
         C = np.array([[6., 8.]])