Changeset 6c8631 in indico

Timestamp:

06/18/10 18:55:08 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

b05fd7

Parents:

49cad7

git-author:

Jeremy Nguyen Xuan <jeremy.nguyen.xuan@…> (01/06/10 12:08:49)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (06/18/10 18:55:08)

Message:

[FIX] error message when genhtml is not in PATH

File:

• indicop/__init__.py (modified) (8 diffs)

indicop/__init__.py

@@ -53 +53 @@
         
         if result:
-            return "All Unit tests succeeded\n"
+            return "PY Unit tests succeeded\n"
         else:
             return "[FAIL] Unit tests - report in indicop/report/unitTest.txt\n"
@@ -97 +97 @@
         report = ""
         if result:
-            report = "All Functional tests succeeded\n"
+            report = "PY Functional tests succeeded\n"
         else:
             report = "[FAIL] Functional tests - report in indicop/report/functionalTest.txt\n"
@@ -114 +114 @@
         else:
             self.writeReport("pylint", statusOutput[1])
-            return "Pylint - report in indicop/report/pylint.txt\n"
+            return "PY Lint - report in indicop/report/pylint.txt\n"
 
 
@@ -129 +129 @@
             #check if server is ready
             for i in range(5):
-                jsDryRun = commands.getstatusoutput("java -jar JsTestDriver-1.2.jar --config jsTestDriverNoCoverage.conf --tests Fake.dryRun")
+                if coverage:
+                    jsDryRun = commands.getstatusoutput("java -jar JsTestDriver-1.2.jar --tests Fake.dryRun --testOutput coverage")
+                else:
+                    jsDryRun = commands.getstatusoutput("java -jar JsTestDriver-1.2.jar --config jsTestDriverNoCoverage.conf --tests Fake.dryRun")
                 if jsDryRun[1].startswith("No browsers were captured, nothing to run..."):
                     print "Js-test-driver server has not started yet. Attempt #%s" % (i+1)
@@ -136 +139 @@
                     #server is ready
                     break
-            
+            else:
+                print '[ERR] Could not start js unit tests because js-test-driver server cannot be started.'
+                sys.exit(1)
+                
             #setting tests to run
             toTest = ""
@@ -152 +158 @@
                 
                 #generate html for coverage
-                commands.getstatusoutput("genhtml jsTestDriver.conf-coverage.dat")
-                
-                coverageReport = "JS Unit Tests - coverage generated in indicop/javascript_tests/coverage/index.html\n"
+                genOutput = commands.getstatusoutput("genhtml jsTestDriver.conf-coverage.dat")
+                
+                if genOutput[1].find("genhtml") > -1:
+                    coverageReport = "[ERR] JS Unit Tests - html coverage generation failed, genhtml needs to be in your PATH.\n"
+                else:
+                    coverageReport = "JS Unit Tests - coverage generated in indicop/javascript_tests/coverage/index.html\n"
+                
             else:
                 jsTest = commands.getstatusoutput("java -jar JsTestDriver-1.2.jar --config jsTestDriverNoCoverage.conf --tests %s --testOutput coverage" % toTest)
@@ -210 +220 @@
 
     def main(self, specify, coverage, unitTest, functionalTest, pylint, jsunit, jslint, jsCoverage, jsSpecify):
-        returnString="=============== ~INDICOP SAYS~ ===============\n\n"
+        returnString="\n\n=============== ~INDICOP SAYS~ ===============\n\n"
         
         if coverage:
@@ -247 +257 @@
                 os.mkdir('indicop/coverage/html_report')
                 figleaf.annotate_html.report_as_html(coverageOutput, 'indicop/coverage/html_report', [], {})
-            returnString += "Unit Test - Report generated in indicop/coverage/html_report/index.html\n"
+            returnString += "PY Unit Test - Report generated in indicop/coverage/html_report/index.html\n"