Added more complete test

fstagni · fstagni · commit 951aff2099d6 · 2013-04-09T16:35:29.000+02:00
diff --git a/Integration/Test_UserJobs.py b/Integration/Test_UserJobs.py
@@ -1,3 +1,8 @@
+""" Testing the API and a bit more.
+    It will submit a number of test jobs locally (via runLocal), using the python unittest to assess the results.
+    Can be automatized.
+"""
+
 from DIRAC.Core.Base.Script import parseCommandLine
 parseCommandLine()
 
@@ -15,8 +20,8 @@
 cwd = os.path.realpath( '.' )
 
 class UserJobTestCase( unittest.TestCase ):
-  ''' Base class for the UserJob test cases
-  '''
+  """ Base class for the UserJob test cases
+  """
   def setUp( self ):
     cleanTestDir()
 
@@ -25,17 +30,56 @@ def setUp( self ):
 
 
 class HelloWorldSuccess( UserJobTestCase ):
+  """ Simplest ever. helloWorld.py just calls 'echo'
+  """
+  def test_execute( self ):
+
+    job = Job()
+
+    job.setName( "helloWorld-test" )
+    job.setExecutable( "helloWorld.py" )
+    res = job.runLocal( self.dirac )
+    self.assertTrue( res['OK'] )
+
+class HelloWorldPlusSuccess( UserJobTestCase ):
+  """ Adding quite a lot of calls from the API, for pure test purpose
+  """
+
   def test_execute( self ):
 
     job = Job()
 
     job.setName( "helloWorld-test" )
-    job.setExecutable( "exe-script.py" )
+    job.setExecutable( "helloWorld.py", arguments = "This is an argument", logFile = "aLogFileForTest.txt" )
+    job.setBannedSites( ['LCG.SiteA.com', 'DIRAC.SiteB.org'] )
+    job.setOwner( 'ownerName' )
+    job.setOwnerGroup( 'ownerGroup' )
+    job.setName( 'jobName' )
+    job.setJobGroup( 'jobGroup' )
+    job.setType( 'jobType' )
+    job.setDestination( 'DIRAC.someSite.ch' )
+    job.setCPUTime( 12345 )
+    job.setLogLevel( 'DEBUG' )
+
     res = job.runLocal( self.dirac )
     self.assertTrue( res['OK'] )
 
+
+# class CatSuccess( UserJobTestCase ):
+#  def test_execute( self ):
+#
+#    job = Job()
+#
+#    job.setName( "cat-test" )
+#    job.setExecutable( "cat.py" )
+#    job.set
+#    res = job.runLocal( self.dirac )
+#    self.assertTrue( res['OK'] )
+
+
 if __name__ == '__main__':
   suite = unittest.defaultTestLoader.loadTestsFromTestCase( UserJobTestCase )
   suite.addTest( unittest.defaultTestLoader.loadTestsFromTestCase( HelloWorldSuccess ) )
+  suite.addTest( unittest.defaultTestLoader.loadTestsFromTestCase( HelloWorldPlusSuccess ) )
   testResult = unittest.TextTestRunner( verbosity = 2 ).run( suite )
 
diff --git a/Integration/cat.py b/Integration/cat.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+'''Script to run Executable application'''
+
+from os import system, environ, pathsep, getcwd
+import sys
+
+# Main
+if __name__ == '__main__':
+
+    environ['PATH'] = getcwd() + ( pathsep + environ['PATH'] )
+
+    sys.exit( system( '''echo Hello World''' ) / 256 )
diff --git a/Integration/helloWorld.py b/Integration/helloWorld.py
