Changeset fbfc3b in indico

Timestamp:

06/18/10 18:55:12 (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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

d160015

Parents:

e65840

git-author:

Jeremy Nguyen Xuan <jeremy.nguyen.xuan@…> (01/08/10 09:36:39)

git-committer:

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

Message:

[FIX] Pylint configuration and Jsunit

Files:

• indicop/Indicop.py (modified) (7 diffs)
• indicop/python/pylint/pylint.conf (modified) (1 diff)
• setup.py (modified) (1 diff)

indicop/Indicop.py

@@ -34 +34 @@
 
 
-class Indicop(object):
+class BaseTest(object):        
     #path to this current file
     setupDir = os.path.dirname(__file__)
@@ -43 +43 @@
         f.close()
 
-    def main(self, specify, coverage, jsSpecify, jsCoverage, testsToRun):
-        
-        #define the set of tests
-        testsDict = {'unit': Unit(),
-                     'functional': Functional(),
-                     'pylint': Pylint(),
-                     'jsunit': Jsunit(jsSpecify, jsCoverage),
-                     'jslint': Jslint()}
-        
-        returnString = "\n\n=============== ~INDICOP SAYS~ ===============\n\n"
-        
-        if coverage:
-            figleaf.start()
-            
-        
-        #specified test can either be unit or functional.
-        #It makes more sense to run it here.
-        if specify:
-            #running directly the test here and ouputing in the console
-            result = nose.run(argv=['nose', '-v', os.path.join(self.setupDir,
-                                                               'python',
-                                                               specify)])
-            if result:
-                returnString += "Specified Test - Succeeded\n"
-            else:
-                returnString += "[FAIL] Specified Test - \
-                                    read output from console\n"
-        else:
-            for test in testsToRun:
-                try:
-                    returnString += testsDict[test].run()
-                except KeyError:
-                    returnString += ("[ERR] Test %s does not exist. "
-                      "It has to be added in the testsDict variable\n") % test
-        
-        
-        if coverage:
-            figleaf.stop()
-            coverageOutput = figleaf.get_data().gather_files()
-            coverageDir = os.path.join(self.setupDir, 'report', 'pycoverage')
-            try:
-                figleaf.annotate_html.report_as_html(coverageOutput,
-                                                     coverageDir, [], {})
-            except IOError:
-                os.mkdir(coverageDir)
-                figleaf.annotate_html.report_as_html(coverageOutput,
-                                                     coverageDir, [], {})
-            returnString += ("PY Unit Test - Report generated in "
-                             "report/pycoverage/index.html\n")
-            
-        
-        return returnString
-
-
-class Unit(Indicop):
+class Unit(BaseTest):
     def run(self):
         #capturing the stderr
@@ -119 +65 @@
             return "[FAIL] Unit tests - report in indicop/report/pyunit.txt\n"
 
-class Functional(Indicop):
+class Functional(BaseTest):
     def run(self):
         try:
@@ -176 +122 @@
         return report
     
-class Pylint(Indicop):
+class Pylint(BaseTest):
     def run(self):
         statusOutput = commands.getstatusoutput("pylint --rcfile=%s %s" % 
@@ -194 +140 @@
             return "PY Lint - report in indicop/report/pylint.txt\n"
         
-class Jsunit(Indicop):
+class Coverage(BaseTest):
+    def start(self):
+        figleaf.start()
+    
+    def stop(self):
+        figleaf.stop()
+        coverageOutput = figleaf.get_data().gather_files()
+        coverageDir = os.path.join(self.setupDir, 'report', 'pycoverage')
+        try:
+            figleaf.annotate_html.report_as_html(coverageOutput,
+                                                 coverageDir, [], {})
+        except IOError:
+            os.mkdir(coverageDir)
+            figleaf.annotate_html.report_as_html(coverageOutput,
+                                                 coverageDir, [], {})
+        return ("PY Unit Test - Report generated in "
+                             "report/pycoverage/index.html\n")
+        
+class Jsunit(BaseTest):
     def __init__(self, jsSpecify, jsCoverage):
         self.coverage = jsCoverage
@@ -314 +278 @@
         return coverageReport + report
     
-class Jslint(Indicop):
+class Jslint(BaseTest):
     def run(self):
         #Folders which are going to be scanned.
@@ -352 +316 @@
         self.writeReport("jslint", outputString)
         return "JS Lint - report in indicop/report/jslint.txt\n"
-    
+
+
+class Indicop(object):
+    
+    def __init__(self, jsspecify, jscoverage):
+        #variables for jsunit
+        self.jsSpecify = jsspecify
+        self.jsCoverage = jscoverage
+        
+        #define the set of tests
+        self.testsDict = {'unit': Unit(),
+                 'functional': Functional(),
+                 'pylint': Pylint(),
+                 'jsunit': Jsunit(self.jsSpecify, self.jsCoverage),
+                 'jslint': Jslint()}
+
+    
+    def main(self, specify, coverage, testsToRun):
+        
+        returnString = "\n\n=============== ~INDICOP SAYS~ ===============\n\n"
+        
+        coverageTest = Coverage()
+        if coverage:
+            coverageTest.start()
+            
+        
+        #specified test can either be unit or functional.
+        #It makes more sense to run it here.
+        if specify:
+            #running directly the test here and ouputing in the console
+            result = nose.run(argv=['nose', '-v', os.path.join(self.setupDir,
+                                                               'python',
+                                                               specify)])
+            if result:
+                returnString += "Specified Test - Succeeded\n"
+            else:
+                returnString += "[FAIL] Specified Test - \
+                                    read output from console\n"
+        else:
+            for test in testsToRun:
+                try:
+                    returnString += self.testsDict[test].run()
+                except KeyError:
+                    returnString += ("[ERR] Test %s does not exist. "
+                      "It has to be added in the testsDict variable\n") % test
+        
+        
+        if coverage:
+            returnString += coverageTest.stop()
+        
+        return returnString
+    

indicop/python/pylint/pylint.conf

@@ -309 +309 @@
 
 # Maximum number of characters on a single line.
-max-line-length=79
+max-line-length=85
 
 # Maximum number of lines in a module

setup.py

@@ -346 +346 @@
             testsToRun.append('jslint')
         
-        result = Indicop().main(self.specify, self.coverage, self.jsspecify, self.jscoverage, testsToRun)
+        indicop = Indicop(self.jsspecify, self.jscoverage)
+        result = indicop.main(self.specify, self.coverage, testsToRun)
         print result