r15321 - /branches/frame_order_testing/test_suite/system_tests/frame_order.py -- February 08, 2012 - 14:48

Author: bugman
Date: Wed Feb  8 14:48:19 2012
New Revision: 15321

URL: http://svn.gna.org/viewcvs/relax?rev=15321&view=rev
Log:
Fix for the failure reporting of the frame order system tests when a save 
state is used.


Modified:
    branches/frame_order_testing/test_suite/system_tests/frame_order.py

Modified: branches/frame_order_testing/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/frame_order.py?rev=15321&r1=15320&r2=15321&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/frame_order.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/frame_order.py Wed 
Feb  8 14:48:19 2012
@@ -143,13 +143,13 @@
         string = string +   "%-15s %30.17g\n" % ('ave_pos_beta:',    
cdp.ave_pos_beta)
         string = string +   "%-15s %30.17g\n" % ('ave_pos_gamma:',   
cdp.ave_pos_gamma)
         string = string +   "%-15s %30.17g\n" % ('chi2:',    cdp.chi2)
-        if hasattr(cdp, 'iter'):
+        if hasattr(cdp, 'iter') and cdp.iter != None:
             string = string +   "%-15s %30i\n" % ('iter:',    cdp.iter)
-        if hasattr(cdp, 'f_count'):
+        if hasattr(cdp, 'f_count') and cdp.f_count != None:
             string = string +   "%-15s %30i\n" % ('f_count:', cdp.f_count)
-        if hasattr(cdp, 'g_count'):
+        if hasattr(cdp, 'g_count') and cdp.g_count != None:
             string = string +   "%-15s %30i\n" % ('g_count:', cdp.g_count)
-        if hasattr(cdp, 'h_count'):
+        if hasattr(cdp, 'h_count') and cdp.h_count != None:
             string = string +   "%-15s %30i\n" % ('h_count:', cdp.h_count)
         if hasattr(cdp, 'warning'):
             string = string +   "%-15s %30s\n" % ('warning:', cdp.warning)