[Erp5-report] r41246 luke - in /erp5/trunk/utils/erp5.appliance.test: CHANGES.txt src/test.py

[nobody at svn.erp5.org]

Author: luke
Date: Thu Dec  9 09:33:47 2010
New Revision: 41246

URL: http://svn.erp5.org?rev=41246&view=rev
Log:
 - fix revision detection

Modified:
    erp5/trunk/utils/erp5.appliance.test/CHANGES.txt
    erp5/trunk/utils/erp5.appliance.test/src/test.py

Modified: erp5/trunk/utils/erp5.appliance.test/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.appliance.test/CHANGES.txt?rev=41246&r1=41245&r2=41246&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] Thu Dec  9 09:33:47 2010
@@ -1,8 +1,13 @@
 2.6 (unreleased)
 ----------------
 
+ - allow to pass revision_detect_url and default to public repository, as
+   previous way of detecting revision, by using passed software url was
+   fetching revision only from this file, instead of whole repository
+
 2.5 (2010-12-08)
 ----------------
+
  - bugfix: during detection ignore paths which are folders, which happens on
    some distributions [Lucas Carvalho]
 

Modified: erp5/trunk/utils/erp5.appliance.test/src/test.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.appliance.test/src/test.py?rev=41246&r1=41245&r2=41246&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] Thu Dec  9 09:33:47 2010
@@ -312,11 +312,11 @@ instance_buildout_complete = instance_bu
 """
 
 
-def detectRevision(config, url):
+def detectRevision(config):
   revision = 'UNKNOWN'
-  etag = urllib.urlopen(url).headers.get('etag')
+  etag = urllib.urlopen(config.revision_detect_url).headers.get('etag')
   if etag is not None:
-    etag = etag.strip("'\"")
+    etag = etag.lstrip('W').lstrip('/').strip("'\"")
     try:
       revision = etag.split('/')[0]
     except IndexError:
@@ -387,7 +387,7 @@ def run_once(config, software_path,
     instance_tail = ''
 
   # Configure ERP5 test reporting handler
-  revision = detectRevision(config, software_profile_url)
+  revision = detectRevision(config)
   erp5_handler = None
   if config.erp5_log is not None:
     config.logger.debug('Configuring external logging system.')
@@ -659,6 +659,10 @@ class Parser(OptionParser):
       Option("-i", "--instance_tail",
              help="File with local additions to instance buildout.",
              type=str),
+      Option("-r", "--revision_detect_url",
+             help="URL used to detect revision of running test.",
+             type=str,
+             default="https://svn.erp5.org/repos/public/"),
     ])
 
   def check_args(self):