If functional tests logs hosted on web server just use directly the url

Gary Williams

22.26.2012 a6bf51f81dc69ef385274bc97c590fb83c0768af

If functional tests logs hosted on web server just use directly the url

 opends/tests/staf-tests/shared/tests/runTestJob.xml

@@ -661,11 +661,19 @@
          write_text_elements(service,testwareElementList)
        
        testwareElementList=[]
        

        #If test logs hosted on web server just use directly the url
        if logsURI.startswith('http://'):
          root_uri = ''
          base_uri = '%s/%s' % (logsURI,os.path.split(logsDir)[1])
        else:
          root_uri = logsURI
          base_uri = logsDir
   
        # Create the id elements
        idElementList=[]
        idElementList.append(['tests-dir',logsDir])
        idElementList.append(['tests-url',logsURI])
        idElementList.append(['tests-dir',base_uri])
        idElementList.append(['tests-url',root_uri])
        idElementList.append(['mailto',SEND_MAIL_TO])
        idElementList.append(['coverage-url',coverageUrl])


 opends/tests/staf-tests/shared/tests/runTests.xml

@@ -56,9 +56,14 @@
        else:
          my_info['snmp jarfile']=SNMP_OPENDMK_JARFILE
        
        #If test logs hosted on web server just use directly the url
        if LOGS_URI.startswith('http://'):
          base_uri = '%s/%s' % (LOGS_URI,os.path.split(local.directory)[1])
        else:
          base_uri = local.directory

        xml_create_report(PRODUCTNAME,TESTS_TYPE,my_path, \
          DSInfo.ServerDict,my_info,local.directory,my_report)
          DSInfo.ServerDict,my_info,base_uri,my_report)

        # Copy the content of results2.xml file to results_tmp.xml
        # And add an xml-stylesheet