Changeset 243335 in indico

Timestamp:

04/13/12 10:13:40 (13 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

0b9955a

Parents:

d80a1e0

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (04/11/12 14:39:29)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/13/12 10:13:40)

Message:

[FIX] Problems in command line arguments

Location:

indico/tests

Files:

• base.py (modified) (1 diff)
• runners.py (modified) (2 diffs)
• tests.conf.sample (modified) (1 diff)

indico/tests/base.py

@@ -104 +104 @@
                 self._options[optName] = optClass(kwargs[optName])
             else:
-                self._options[optName] = optClass(False)
+                self._options[optName] = optClass(None)
 
         for optName in kwargs:

indico/tests/runners.py

@@ -225 +225 @@
                       'server_url': Option,
                       'specify': Option,
-                      'repeat': Option,
                       'xml': XMLOutputOption}
 
@@ -253 +252 @@
         # Execute the tests
         result = True
-        repeat = int(self.options.valueOf('repeat'))
-        if repeat < 1:
-            repeat = 1
-
-        os.environ['INDICO_TEST_MODE'] = mode
-        os.environ['INDICO_TEST_URL'] = self.options.valueOf('server_url')
+
+        os.environ['INDICO_TEST_MODE'] = mode or ''
+        os.environ['INDICO_TEST_URL'] = self.options.valueOf('server_url') or ''
 
         for browser in browsers:

indico/tests/tests.conf.sample

@@ -51 +51 @@
 RunMode = 'local'
 StandaloneBrowser = 'firefox'
-
-# Grid
-
-HubURL         = "indicotest1.cern.ch"
-HubPort        = 4444
 GridBrowsers   = ['firefox',
                   'safari',