r28007 - /trunk/test_suite/system_tests/pcs.py -- October 05, 2015 - 19:01

Author: bugman
Date: Mon Oct  5 19:01:11 2015
New Revision: 28007

URL: http://svn.gna.org/viewcvs/relax?rev=28007&view=rev
Log:
Fix for the PCS system tests on old Python versions.

The self.assertAlmostEqual() function cannot compare None values in earlier 
Python versions.


Modified:
    trunk/test_suite/system_tests/pcs.py

Modified: trunk/test_suite/system_tests/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/pcs.py?rev=28007&r1=28006&r2=28007&view=diff
==============================================================================
--- trunk/test_suite/system_tests/pcs.py        (original)
+++ trunk/test_suite/system_tests/pcs.py        Mon Oct  5 19:01:11 2015
@@ -396,7 +396,10 @@
                 if i == 1 and j == 1:
                     self.assert_(not hasattr(spin, 'pcs'))
                 else:
-                    self.assertAlmostEqual(pcs[i][j], spin.pcs['tb'])
+                    if pcs[i][j] == None:
+                        self.assertEqual(pcs[i][j], spin.pcs['tb'])
+                    else:
+                        self.assertAlmostEqual(pcs[i][j], spin.pcs['tb'])
                 j += 1
 
 
@@ -455,11 +458,12 @@
                 if i == 1 and j == 1:
                     self.assert_(not hasattr(spin, 'pcs'))
                 else:
-                    self.assertAlmostEqual(pcs[i][j], spin.pcs['tb'])
-                    if pcs[i][j] != None:
+                    if pcs[i][j] == None:
+                        self.assertEqual(None, spin.pcs['tb'])
+                        self.assertEqual(None, spin.pcs_bc['tb'])
+                    else:
+                        self.assertAlmostEqual(pcs[i][j], spin.pcs['tb'])
                         self.assertAlmostEqual(pcs[i][j]+1.0, 
spin.pcs_bc['tb'])
-                    else:
-                        self.assertEqual(None, spin.pcs_bc['tb'])
                 j += 1