Changeset 26fe83 in indico

Timestamp:

06/18/10 18:58:56 (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:

c571e5

Parents:

590de6

git-author:

Jeremy Nguyen Xuan <jeremy.nguyen.xuan@…> (01/28/10 18:27:43)

git-committer:

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

Message:

[FIX] unzip function was bugged

Files:

• indicop/Indicop.py (modified) (2 diffs)
• setup.py (modified) (5 diffs)

indicop/Indicop.py

@@ -156 +156 @@
 
             #retrieving tests from Indicop folder
-            args = ['nose', '--nologcapture','--logging-clear-handlers', '-v', os.path.join(self.setupDir, 'python', 'unit')]
+            args = ['nose', '--nologcapture', '--logging-clear-handlers', '-v', os.path.join(self.setupDir, 'python', 'unit')]
             #retrieving tests from plugins folder
             for folder in self.walkThroughFolders(os.path.join(self.setupDir,
@@ -249 +249 @@
 
         #retrieving tests from Indicop folder
-        args = ['nose', '-v', os.path.join(self.setupDir, 'python', 'functional')]
+        args = ['nose', '--nologcapture', '--logging-clear-handlers', '-v', os.path.join(self.setupDir, 'python', 'functional')]
         #retrieving tests from plugins folder
         for folder in self.walkThroughFolders(os.path.join(self.setupDir,

setup.py

@@ -385 +385 @@
         """check if needed jars are here, if not, dowloading them and unzip a file if necessary"""
         jarsList = {}
+        currentFilePath = os.path.dirname(__file__)
 
         jarsList['jsunit'] = {'url': "http://js-test-driver.googlecode.com/files/JsTestDriver-1.2.jar",
-                                      'path': os.path.join(os.path.dirname(__file__),
+                                      'path': os.path.join(currentFilePath,
                                             'indicop',
                                             'javascript',
@@ -394 +395 @@
 
         jarsList['jscoverage'] = {'url': "http://js-test-driver.googlecode.com/files/coverage-1.2.jar",
-                                  'path': os.path.join(os.path.dirname(__file__),
+                                  'path': os.path.join(currentFilePath,
                                         'indicop',
                                         'javascript',
@@ -402 +403 @@
 
         jarsList['selenium'] = {'url': "http://release.seleniumhq.org/selenium-remote-control/1.0.1/selenium-remote-control-1.0.1-dist.zip",
-                                'path': os.path.join(os.path.dirname(__file__),
+                                'path': os.path.join(currentFilePath,
                                         'indicop',
                                         'python',
@@ -409 +410 @@
                                 'zipname': "selenium-remote-control-1.0.1-dist.zip",
                                 'inZipPath': "selenium-remote-control-1.0.1/selenium-server-1.0.1/selenium-server.jar"}
-
 
         validJars = True
@@ -451 +451 @@
             zfobj = zipfile.ZipFile(zipPath)
             outfile = open(targetFile, 'wb')
-            outfile.write(zfobj.read('inZipPath'))
+            outfile.write(zfobj.read(inZipPath))
             outfile.flush()
             outfile.close()
-        finally:
+
             #delete zip file
             os.unlink(zipPath)
+        except NameError, e:
+            print e
 
 if __name__ == '__main__':