Changeset 1761
- Timestamp:
- 10/21/07 18:02:17
- Files:
-
- trunk/cherrypy/test/webtest.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/test/webtest.py
r1666 r1761 17 17 """ 18 18 19 import os, sys, time, re 19 import httplib 20 import os 21 import pprint 22 import re 23 import socket 24 import sys 25 import time 26 import traceback 20 27 import types 21 import pprint22 import socket23 import httplib24 import traceback25 28 26 29 from unittest import * … … 49 52 # Overridden to remove unnecessary empty lines and separators 50 53 result = self._makeResult() 51 startTime = time.time()52 54 test(result) 53 timeTaken = float(time.time() - startTime)54 55 result.printErrors() 55 56 if not result.wasSuccessful(): … … 143 144 PROTOCOL = "HTTP/1.1" 144 145 146 scheme = "http" 147 url = None 148 149 status = None 150 headers = None 151 body = None 152 time = None 153 145 154 def set_persistent(self, on=True, auto_open=False): 146 155 """Make our HTTP_CONN persistent (or not). … … 189 198 190 199 self.url = url 200 self.time = None 201 start = time.time() 191 202 result = openURL(url, headers, method, body, self.HOST, self.PORT, 192 203 self.HTTP_CONN, protocol or self.PROTOCOL) 204 self.time = time.time() - start 193 205 self.status, self.headers, self.body = result 194 206

