Skip to content

Commit

Permalink
Update selenium version used
Browse files Browse the repository at this point in the history
  • Loading branch information
lbartoli79 committed Aug 6, 2024
1 parent 3e9509c commit fc91727
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
22 changes: 21 additions & 1 deletion internal/support/firefox_log_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,14 @@ def socket_thread_http_entry(self, msg):
socket = self.http['current_socket']
self.http['connections'][connection] = {'socket': socket}
del self.http['current_socket']
elif msg['message'].startswith('TlsHandshaker::SetupSSL '):
match = re.search(r'^TlsHandshaker::SetupSSL (?P<connection>[\w\d]+)',
msg['message'])
if match:
connection = match.groupdict().get('connection')
if connection in self.http['connections']:
if 'ssl_start' not in self.http['connections'][connection]:
self.http['connections'][connection]['ssl_start'] = msg['timestamp']
elif msg['message'].startswith('nsHttpConnection::SetupSSL '):
match = re.search(r'^nsHttpConnection::SetupSSL (?P<connection>[\w\d]+)',
msg['message'])
Expand Down Expand Up @@ -332,6 +340,17 @@ def socket_thread_http_entry(self, msg):
if byte_count > 0 and trans_id in self.http['requests'] and \
'start' not in self.http['requests'][trans_id]:
self.http['requests'][trans_id]['start'] = msg['timestamp']
elif msg['message'].startswith('nsHttpTransaction::OnSocketStatus ') and \
msg['message'].find(' status=4b0005 progress=') > -1:
match = re.search(r'^nsHttpTransaction::OnSocketStatus '
r'\[this=(?P<id>[\w\d]+) status=4b0005 progress=(?P<bytes>[\d+]+)',
msg['message'])
if match:
trans_id = match.groupdict().get('id')
byte_count = int(match.groupdict().get('bytes'))
if byte_count > 0 and trans_id in self.http['requests'] and \
'start' not in self.http['requests'][trans_id]:
self.http['requests'][trans_id]['start'] = msg['timestamp']
elif msg['message'].startswith('nsHttpTransaction::ProcessData '):
match = re.search(r'^nsHttpTransaction::ProcessData \[this=(?P<id>[\w\d]+)',
msg['message'])
Expand Down Expand Up @@ -446,14 +465,15 @@ def socket_transport_entry(self, msg):
port = match.groupdict().get('port')
self.http['sockets'][socket] = {'host': host, 'port': port}
# nsSocketTransport::SendStatus [this=143f4000 status=804b0007]
# nsSocketTransport::SendStatus [this=7fe074bd2a00 status=4B0007]
elif msg['message'].startswith('nsSocketTransport::SendStatus '):
match = re.search(r'^nsSocketTransport::SendStatus \['
r'this=(?P<socket>[\w\d]+) '
r'status=(?P<status>[\w\d]+)', msg['message'])
if match:
socket = match.groupdict().get('socket')
status = match.groupdict().get('status')
if status == '804b0007':
if status in ['804b0007', '4b0007']:
if socket not in self.http['sockets']:
self.http['sockets'][socket] = {}
if 'start' not in self.http['sockets'][socket]:
Expand Down
2 changes: 1 addition & 1 deletion wptagent.py
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ def fix_selenium_version():
newer versions are going to use 4.8.3
"""
from internal.os_util import run_elevated
version = '4.8.3'
version = '4.18.1'
if sys.version_info[1] == 6:
version = '3.141.0'

Expand Down

0 comments on commit fc91727

Please sign in to comment.