Merge branch 'trunk' into remove-py2.x-test

Author: harsha509

dotnet/src/webdriver/BiDi/Communication/Transport/WebSocketTransport.cs

@@ -16,9 +16,10 @@ public class WebSocketTransport(Uri _uri) : ITransport, IDisposable
     private readonly ClientWebSocket _webSocket = new();
     private readonly ArraySegment<byte> _receiveBuffer = new(new byte[1024 * 8]);
 
+    private readonly SemaphoreSlim _socketSendSemaphoreSlim = new(1, 1);
+
     public async Task ConnectAsync(CancellationToken cancellationToken)
     {
-        _webSocket.Options.SetBuffer(_receiveBuffer.Count, _receiveBuffer.Count, _receiveBuffer);
         await _webSocket.ConnectAsync(_uri, cancellationToken).ConfigureAwait(false);
     }
 
@@ -32,8 +33,9 @@ public async Task<T> ReceiveAsJsonAsync<T>(JsonSerializerOptions jsonSerializerO
         {
             result = await _webSocket.ReceiveAsync(_receiveBuffer, cancellationToken).ConfigureAwait(false);
 
-            await ms.WriteAsync(_receiveBuffer.Array!, _receiveBuffer.Offset, result.Count).ConfigureAwait(false);
-        } while (!result.EndOfMessage);
+            await ms.WriteAsync(_receiveBuffer.Array!, _receiveBuffer.Offset, result.Count, cancellationToken).ConfigureAwait(false);
+        }
+        while (!result.EndOfMessage);
 
         ms.Seek(0, SeekOrigin.Begin);
 
@@ -51,12 +53,21 @@ public async Task SendAsJsonAsync(Command command, JsonSerializerOptions jsonSer
     {
         var buffer = JsonSerializer.SerializeToUtf8Bytes(command, typeof(Command), jsonSerializerOptions);
 
-        if (_logger.IsEnabled(LogEventLevel.Trace))
+        await _socketSendSemaphoreSlim.WaitAsync(cancellationToken);
+
+        try
         {
-            _logger.Trace($"BiDi SND >> {buffer.Length} > {Encoding.UTF8.GetString(buffer)}");
-        }
+            if (_logger.IsEnabled(LogEventLevel.Trace))
+            {
+                _logger.Trace($"BiDi SND >> {buffer.Length} > {Encoding.UTF8.GetString(buffer)}");
+            }
 
-        await _webSocket.SendAsync(new ArraySegment<byte>(buffer), WebSocketMessageType.Text, true, cancellationToken).ConfigureAwait(false);
+            await _webSocket.SendAsync(new ArraySegment<byte>(buffer), WebSocketMessageType.Text, true, cancellationToken).ConfigureAwait(false);
+        }
+        finally
+        {
+            _socketSendSemaphoreSlim.Release();
+        }
     }
 
     public void Dispose()

dotnet/src/webdriver/Remote/HttpCommandExecutor.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -417,7 +418,11 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 var responseTask = base.SendAsync(request, cancellationToken);
 
                 StringBuilder requestLogMessageBuilder = new();
-                requestLogMessageBuilder.AppendFormat(">> {0}", request);
+                requestLogMessageBuilder.AppendFormat(">> {0} RequestUri: {1}, Content: {2}, Headers: {3}", 
+                    request.Method, 
+                    request.RequestUri?.ToString() ?? "null", 
+                    request.Content?.ToString() ?? "null", 
+                    request.Headers?.Count());
 
                 if (request.Content != null)
                 {
@@ -430,7 +435,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 var response = await responseTask.ConfigureAwait(false);
 
                 StringBuilder responseLogMessageBuilder = new();
-                responseLogMessageBuilder.AppendFormat("<< {0}", response);
+                responseLogMessageBuilder.AppendFormat("<< StatusCode: {0}, ReasonPhrase: {1}, Content: {2}, Headers: {3}", (int)response.StatusCode, response.ReasonPhrase, response.Content, response.Headers?.Count());
 
                 if (!response.IsSuccessStatusCode && response.Content != null)
                 {

java/src/org/openqa/selenium/remote/HttpCommandExecutor.java

@@ -44,11 +44,11 @@
 public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs {
 
   private final URL remoteServer;
-  private final HttpClient client;
+  public final HttpClient client;
   private final HttpClient.Factory httpClientFactory;
   private final Map<String, CommandInfo> additionalCommands;
-  private CommandCodec<HttpRequest> commandCodec;
-  private ResponseCodec<HttpResponse> responseCodec;
+  protected CommandCodec<HttpRequest> commandCodec;
+  protected ResponseCodec<HttpResponse> responseCodec;
 
   private LocalLogs logs = LocalLogs.getNullLogger();
 

java/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -118,7 +118,7 @@ public class RemoteWebDriver
   private Level level = Level.FINE;
   private ErrorHandler errorHandler = new ErrorHandler();
   private CommandExecutor executor;
-  private Capabilities capabilities;
+  protected Capabilities capabilities;
   private SessionId sessionId;
   private FileDetector fileDetector = new UselessFileDetector();
   private ExecuteMethod executeMethod;

java/src/org/openqa/selenium/remote/service/DriverService.java

@@ -355,7 +355,7 @@ private enum StartOrDie {
   public abstract static class Builder<DS extends DriverService, B extends Builder<?, ?>> {
 
     private int port = 0;
-    private File exe = null;
+    public File exe = null;
     private Map<String, String> environment = emptyMap();
     private File logFile;
     private Duration timeout;

java/src/org/openqa/selenium/support/ui/FluentWait.java

@@ -66,15 +66,15 @@ public class FluentWait<T> implements Wait<T> {
 
   private static final Duration DEFAULT_WAIT_DURATION = Duration.ofMillis(DEFAULT_SLEEP_TIMEOUT);
 
-  private final T input;
-  private final java.time.Clock clock;
-  private final Sleeper sleeper;
+  protected final T input;
+  protected final java.time.Clock clock;
+  protected final Sleeper sleeper;
 
-  private Duration timeout = DEFAULT_WAIT_DURATION;
-  private Duration interval = DEFAULT_WAIT_DURATION;
-  private Supplier<String> messageSupplier = () -> null;
+  protected Duration timeout = DEFAULT_WAIT_DURATION;
+  protected Duration interval = DEFAULT_WAIT_DURATION;
+  protected Supplier<String> messageSupplier = () -> null;
 
-  private final List<Class<? extends Throwable>> ignoredExceptions = new ArrayList<>();
+  protected final List<Class<? extends Throwable>> ignoredExceptions = new ArrayList<>();
 
   /**
    * @param input The input value to pass to the evaluated conditions.

py/test/selenium/webdriver/common/network.py

@@ -25,10 +25,7 @@
 
     def get_interface_ip(ifname):
         def _bytes(value, encoding):
-            try:
-                return bytes(value, encoding)  # Python 3
-            except TypeError:
-                return value  # Python 2
+            return bytes(value, encoding)
 
         sckt = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         return socket.inet_ntoa(