Changeset 282

Timestamp:

04/02/15 14:44:34 (5 years ago)

Author:

astephen

Message:

further cleaning of unitTestsS2

File:

• CCCC/trunk/ceda_cc/unitTestsS2.py (modified) (2 diffs)

CCCC/trunk/ceda_cc/unitTestsS2.py

@@ -42 +42 @@
   print 'Failed [%s] %s: valid file name' % (module,fn)
 
-if sys.version_info > (2,6):
+if sys.version_info >= (2,7):
   ## monitoting file handles uses a "subprocess" method which is not available in python 2.6
   testId = '#11.001'
@@ -52 +52 @@
     raise baseException( 'Failed [%s]: dummy run triggered exception' % testId )
 
-testId = '#11.002'
-if m.monitor.fhCountMax < 10:
-  print 'OK: [%s]: fhCountMax = %s' % ( testId, m.monitor.fhCountMax )
-else:
-  print 'Failed [%s]: fhCountMax = %s' % ( testId, m.monitor.fhCountMax )
+  testId = '#11.002'
+  if m.monitor.fhCountMax < 10:
+    print 'OK: [%s]: fhCountMax = %s' % ( testId, m.monitor.fhCountMax )
+  else:
+    print 'Failed [%s]: fhCountMax = %s' % ( testId, m.monitor.fhCountMax )
 
 testId = '#11.003'