added division from __future__, to let tests work on python 2.7 again

repagh · repagh · commit 39dc8c9f8e4c · 2013-07-16T12:30:25.000Z
Added seeding the numpy random generator, to prevent spurious errors when 
using rss system
diff --git a/tests/convert_test.py b/tests/convert_test.py
@@ -34,6 +34,8 @@ def setUp(self):
         self.maxIO = 5
         # Set to True to print systems to the output.
         self.debug = False
+        # get consistent results
+        np.random.seed(9)
 
     def printSys(self, sys, ind):
         """Print system to the standard output."""
diff --git a/tests/frd_test.py b/tests/frd_test.py
@@ -4,6 +4,7 @@
 # RvP, 4 Oct 2012
 
 
+from __future__ import division
 import unittest
 import numpy as np
 from control.statesp import StateSpace
diff --git a/tests/matlab_test.py b/tests/matlab_test.py
@@ -8,7 +8,7 @@
 # nothing crashes.  It doesn't test actual functionality; the module
 # specific unit tests will do that.
 
-from __future__ import print_function
+from __future__ import print_function, division
 import unittest
 import numpy as np
 from scipy.linalg import eigvals
@@ -86,6 +86,9 @@ def setUp(self):
         D = np.matrix("9. 0.;"
                       "0. 9. ")
         self.mimo_ss1 = ss(A, B, C, D)
+
+        # get consistent test results
+        np.random.seed(0)
         
     def testParallel(self):
         sys1 = parallel(self.siso_ss1, self.siso_ss2)
diff --git a/tests/minreal_test.py b/tests/minreal_test.py
@@ -3,6 +3,7 @@
 # minreal_test.py - test state space class
 # Rvp, 13 Jun 2013
 
+from __future__ import division
 import unittest
 import numpy as np
 from scipy.linalg import eigvals
diff --git a/tests/statefbk_test.py b/tests/statefbk_test.py
@@ -20,6 +20,8 @@ def setUp(self):
         self.maxTries = 4
         # Set to True to print systems to the output.
         self.debug = False
+        # get consistent test results
+        np.random.seed(0)
 
     def testCtrbSISO(self):
         A = np.matrix("1. 2.; 3. 4.")
diff --git a/tests/statesp_test.py b/tests/statesp_test.py
@@ -3,6 +3,7 @@
 # statesp_test.py - test state space class
 # RMM, 30 Mar 2011 (based on TestStateSp from v0.4a)
 
+from __future__ import division
 import unittest
 import numpy as np
 from scipy.linalg import eigvals
diff --git a/tests/xferfcn_test.py b/tests/xferfcn_test.py
@@ -3,6 +3,7 @@
 # xferfcn_test.py - test TransferFunction class
 # RMM, 30 Mar 2011 (based on TestXferFcn from v0.4a)
 
+from __future__ import division
 import unittest
 import numpy as np
 from control.statesp import StateSpace, _convertToStateSpace
