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

[nobody at svn.erp5.org]

Author: luke
Date: Fri Nov 19 11:46:49 2010
New Revision: 40404

URL: http://svn.erp5.org?rev=40404&view=rev
Log:
 - allow no port definition in post URL by defaulting to protocol port
 - do not trust self in logger handler to support case of too early closed
   program

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=40404&r1=40403&r2=40404&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] Fri Nov 19 11:46:49 2010
@@ -1,8 +1,15 @@
 1.1 (unreleased)
 ----------------
 
+ - Allow no port definition in post URL.
+   [Łukasz Nowak]
+
+ - Support case when program exited to early, so no more additional tracebacks
+   are emitted.
+   [Łukasz Nowak]
+
 1.0 (2010-11-19)
 ----------------
 
- - Initial version
+ - Initial version.
    [Łukasz Nowak]

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=40404&r1=40403&r2=40404&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] Fri Nov 19 11:46:49 2010
@@ -60,13 +60,17 @@ class ConnectionHelper:
     self.conn = urlparse.urlparse(url)
     if self.conn.scheme == 'http':
       connection_type = httplib.HTTPConnection
+      if self.conn.port is None:
+        self.port = 80
     else:
       connection_type = httplib.HTTPSConnection
+      if self.conn.port is None:
+        self.port = 443
     self.connection_type = connection_type
 
   def _connect(self):
     self.connection = self.connection_type(self.conn.hostname + ':' +
-        str(self.conn.port))
+        str(self.conn.port or self.port))
 
   def POST(self, path, parameter_dict, file_list=None):
     self._connect()
@@ -182,6 +186,9 @@ class ERP5TestReportHandler(FileHandler)
 
   def close(self):
     FileHandler.close(self)
+    if getattr(self, 'ran_trick', None) is None:
+      # closed too early, nothing to report
+      return
     # make file parsable by erp5_test_results
     tempcmd = tempfile.mkstemp()[1]
     tempcmd2 = tempfile.mkstemp()[1]