Changeset b5b039 in indico

Timestamp:

06/18/10 18:59:00 (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:

7d88c9

Parents:

574b7d

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (06/16/10 14:14:21)

git-committer:

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

Message:

[FIX] initial_setup - webserver uid/gid spec

• re-introduced it;
• also improved error handling in JS Unit;

Location:

indico

Files:

• MaKaC/consoleScripts/indicoInitialSetup.py (modified) (3 diffs)
• tests/runners.py (modified) (3 diffs)

indico/MaKaC/consoleScripts/indicoInitialSetup.py

@@ -61 +61 @@
     global eggDir
 
-    optlist, args = getopt.getopt(sys.argv[1:],'',['rpm','existing-config='])
+    optlist, args = getopt.getopt(sys.argv[1:],'',['rpm','existing-config=',
+                                                   'www-uid=','www-gid='])
+
+    wwwUid = None
+    wwwGid = None
 
     forRPM = False
@@ -71 +75 @@
         elif o == '--existing-config':
             existingPath = a
+        elif o == "--www-uid":
+            wwwUid = a
+        elif o == "--www-gid":
+            wwwGid = a
 
     setIndicoInstallMode(True)
@@ -97 +105 @@
                                      'common'),
                         eggDir,
-                        force_no_db=(existingPath != None))
+                        force_no_db=(existingPath != None),
+                        uid = wwwUid,
+                        gid = wwwGid)
 
 if __name__ == '__main__':

indico/tests/runners.py

@@ -680 +680 @@
                                               getJSUnitFilename(),
                                               JSTEST_CFG_FILE))
-                if jsDryRun[1].startswith("No browsers were captured"):
-                    print ("Js-test-driver server has not started yet. "
-                           "Attempt #%s\n") % (i+1)
+
+                # Not very nice error checking, but how to do it nicely?
+                if "browsers" in jsDryRun[1] or \
+                    "Connection refused" in jsDryRun[1]:
+                    print "Js-test-driver server has not started yet. " \
+                          "Attempt #%s\n" % (i+1)
                     time.sleep(5)
                 else:
@@ -688 +691 @@
                     break
             else:
-                return ('[ERR] Could not start js unit tests because '
-                        'js-test-driver server cannot be started.\n')
+                raise Exception('Could not start js unit tests because '
+                                'js-test-driver server cannot be started.\n')
 
             #setting tests to run
@@ -723 +726 @@
 
         except OSError, e:
-            return ("[ERR] Could not start js-test-driver server - command "
-                    "\"java\" needs to be in your PATH. (%s)\n" % e)
+            self._error("[ERR] Could not start js-test-driver server - command "
+                        "\"java\" needs to be in your PATH. (%s)\n" % e)
         except KeyError:
-            return "[ERR] Please specify a JSUnitFilename in tests.conf\n"
-
-        #stopping the server
-        server.kill()
+            self._error("[ERR] Please specify a JSUnitFilename in tests.conf\n")
+        except Exception, e:
+            self._error(e)
+        finally:
+            # stopping the server
+            server.kill()
+
         return True