Deleted
Added
http.py (1424:449e7e7d25c9) | http.py (1444:8f7f7970c07a) |
---|---|
1import binascii 2import io 3import os 4import re 5import time 6import json 7import socket 8import select --- 159 unchanged lines hidden (view full) --- 168 169 def post(self, **kwargs): 170 return self.http('POST', **kwargs) 171 172 def put(self, **kwargs): 173 return self.http('PUT', **kwargs) 174 175 def recvall(self, sock, **kwargs): | 1import binascii 2import io 3import os 4import re 5import time 6import json 7import socket 8import select --- 159 unchanged lines hidden (view full) --- 168 169 def post(self, **kwargs): 170 return self.http('POST', **kwargs) 171 172 def put(self, **kwargs): 173 return self.http('PUT', **kwargs) 174 175 def recvall(self, sock, **kwargs): |
176 timeout = 60 if 'read_timeout' not in kwargs else kwargs['read_timeout'] | 176 timeout_default = 60 177 178 timeout = ( 179 timeout_default 180 if 'read_timeout' not in kwargs 181 else kwargs['read_timeout'] 182 ) |
177 buff_size = 4096 if 'buff_size' not in kwargs else kwargs['buff_size'] 178 179 data = b'' | 183 buff_size = 4096 if 'buff_size' not in kwargs else kwargs['buff_size'] 184 185 data = b'' |
180 while select.select([sock], [], [], timeout)[0]: | 186 while True: 187 rlist = select.select([sock], [], [], timeout)[0] 188 if not rlist: 189 # For all current cases if the "read_timeout" was changed 190 # than test do not expect to get a response from server. 191 if timeout == timeout_default: 192 self.fail('Can\'t read response from server.') 193 break 194 |
181 try: 182 part = sock.recv(buff_size) 183 except: 184 break 185 186 data += part 187 188 if not len(part): --- 175 unchanged lines hidden --- | 195 try: 196 part = sock.recv(buff_size) 197 except: 198 break 199 200 data += part 201 202 if not len(part): --- 175 unchanged lines hidden --- |