[Zope-CVS] CVS: Packages/FunctionalTests/FunctionalTests - FTRunner.py:1.4

[Tres Seaver]

Update of /cvs-repository/Packages/FunctionalTests/FunctionalTests
In directory cvs.zope.org:/tmp/cvs-serv21045/FunctionalTests

Modified Files:
	FTRunner.py 
Log Message:


  - Use 'site_host' instead of 'portal_url' everywhere.


=== Packages/FunctionalTests/FunctionalTests/FTRunner.py 1.3 => 1.4 ===
--- Packages/FunctionalTests/FunctionalTests/FTRunner.py:1.3	Tue May 20 21:05:05 2003
+++ Packages/FunctionalTests/FunctionalTests/FTRunner.py	Sat May 24 18:17:23 2003
@@ -16,7 +16,7 @@
     _check_elapsed_times    = 1
     _time_requests          = 1
     _config_file            = '.zftrc'
-    _portal_url             = 'http://localhost:8080/'
+    _site_host              = 'http://localhost:8080/'
     _site_path              = '/'
     _filenames              = ()
     _app                    = _marker
@@ -31,8 +31,8 @@
         """
         print """\
 
-%(RUNNER_EXE)s [-htTvq] [-c config_file] \\
-          [-u portal_url] [-r site_path] \\
+%(RUNNER_EXE)s [-?tTvq] [-c config_file] \\
+          [-h site_host] [-p site_path] \\
           [name1=value]* scenario_1 ...
 
     -?, --help                      Print this help message
@@ -64,8 +64,8 @@
     -c, --config-file               Use defaults from 'config_file'
                                     (default is '%(CONFIG_FILE)s')
 
-    -u, --portal-url                Use 'portal_url' as test target server
-                                    (default is '%(PORTAL_URL)s')
+    -h, --site-host                 Use 'site_host' as test target server
+                                    (default is '%(SITE_HOST)s')
 
     -p, --site-path                 Use 'site_path' as test target path
                                     (default is '%(SITE_PATH)s')
@@ -79,7 +79,7 @@
 %(MESSAGE)s
         """ % ( { 'RUNNER_EXE'  : sys.argv[0]
                 , 'CONFIG_FILE' : self._config_file
-                , 'PORTAL_URL'  : self._portal_url
+                , 'SITE_HOST'   : self._site_host
                 , 'SITE_PATH'   : self._site_path
                 , 'MESSAGE'     : message and 'Error: %s' % message or ''
                 } )
@@ -90,13 +90,13 @@
             Parse command line options.
         """
         verbosity = 1
-        portal_url = site_path = config_file = None
+        site_host = site_path = config_file = None
         time_requests = check_responses = check_elapsed_times = None
         check_redirects = check_content = None
 
         try:
             opts, arglist = getopt.getopt( args
-                                           , "?tTrRcCdDeEvqc:u:p:"
+                                           , "?tTrRcCdDeEvqc:h:p:"
                                            , [ 'help'
                                              , 'time-requests'
                                              , 'no-time-requests'
@@ -111,7 +111,7 @@
                                              , 'verbose'
                                              , 'quiet'
                                              , 'config-file='
-                                             , 'portal-url='
+                                             , 'site-host='
                                              , 'site-path='
                                              ]
                                            )
@@ -162,8 +162,8 @@
             if o == '-c' or o == '--config-file':
                 config_file = v
 
-            if o == '-u' or o == '--portal-url':
-                portal_url = v
+            if o == '-h' or o == '--site-host':
+                site_host = v
 
             if o == '-p' or o == '--site-path':
                 site_path = v
@@ -176,7 +176,7 @@
         self._filenames = filenames
 
         # First initial defaults, ...
-        self._defaults = { 'portal_url' : self._portal_url
+        self._defaults = { 'site_host' : self._site_host
                          , 'site_path'  : self._site_path
                          }
 
@@ -215,8 +215,8 @@
         if check_elapsed_times is not None:
             self._check_elapsed_times = check_elapsed_times
 
-        if portal_url is not None:
-            self._defaults[ 'portal_url' ] = portal_url
+        if site_host is not None:
+            self._defaults[ 'site_host' ] = site_host
 
         if site_path is not None:
             self._defaults[ 'site_path' ] = site_path