r12276 - /1.3/test_suite/system_tests/model_free.py -- January 13, 2011 - 10:53

Author: bugman
Date: Thu Jan 13 10:53:03 2011
New Revision: 12276

URL: http://svn.gna.org/viewcvs/relax?rev=12276&view=rev
Log:
Modified the value_test() model-free system test method to skip certain 
parameters if not a float or None.


Modified:
    1.3/test_suite/system_tests/model_free.py

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=12276&r1=12275&r2=12276&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Thu Jan 13 10:53:03 2011
@@ -2269,27 +2269,27 @@
             self.assertEqual(spin.s2s, None, msg=mesg)
 
         # te correlation time.
-        if te != None:
+        if type(te) == float:
             self.assertAlmostEqual(spin.te / 1e-9, te / 1e3, msg=mesg)
-        else:
+        elif te == None:
             self.assertEqual(spin.te, None, msg=mesg)
 
         # tf correlation time.
-        if tf != None:
+        if type(tf) == float:
             self.assertAlmostEqual(spin.tf / 1e-9, tf / 1e3, msg=mesg)
-        else:
+        elif tf == None:
             self.assertEqual(spin.tf, None, msg=mesg)
 
         # ts correlation time.
-        if ts != None:
+        if type(ts) == float:
             self.assertAlmostEqual(spin.ts / 1e-9, ts / 1e3, msg=mesg)
-        else:
+        elif ts == None:
             self.assertEqual(spin.ts, None, msg=mesg)
 
         # Chemical exchange.
-        if rex != None:
+        if type(rex) == float:
             self.assertAlmostEqual(spin.rex * (2.0 * pi * spin.frq[0])**2, 
rex, msg=mesg)
-        else:
+        elif rex == None:
             self.assertEqual(spin.rex, None, msg=mesg)
 
         # The optimisation stats.