From eb887f6b56ffcd5231e87bbd46e043c756d16425 Mon Sep 17 00:00:00 2001 From: Lewis Marshall Date: Mon, 5 Aug 2024 00:22:36 +0100 Subject: [PATCH 1/2] WIP test against the lmars-dev cluster Signed-off-by: Lewis Marshall --- .../AuthTests/AuthSandboxSpecs.cs | 2 +- src/IO.Ably.Tests.Shared/ClientOptionsTests.cs | 8 ++++---- src/IO.Ably.Tests.Shared/DefaultTests.cs | 12 ++++++------ .../Infrastructure/AblyCollectionFixture.cs | 2 +- .../Infrastructure/AblySandboxFixture.cs | 4 ++-- .../ConnectionSpecs/ConnectionFallbackSpecs.cs | 2 +- src/IO.Ably.Tests.Shared/Rest/ChannelSandboxSpecs.cs | 4 ++-- src/IO.Ably.Tests.Shared/Rest/JwtSandboxSpec.cs | 4 ++-- src/IO.Ably.Tests.Shared/Rest/RestSpecs.cs | 2 +- .../Tests/AblySandbox/AblyCollectionFixture.cs | 2 +- unity/Assets/Tests/AblySandbox/AblySandboxFixture.cs | 4 ++-- unity/Assets/Tests/EditMode/AuthSandboxSpecs.cs | 2 +- unity/Assets/Tests/PlayMode/AuthSandboxSpecs.cs | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/IO.Ably.Tests.Shared/AuthTests/AuthSandboxSpecs.cs b/src/IO.Ably.Tests.Shared/AuthTests/AuthSandboxSpecs.cs index d4e9219f5..6f1c5ce41 100644 --- a/src/IO.Ably.Tests.Shared/AuthTests/AuthSandboxSpecs.cs +++ b/src/IO.Ably.Tests.Shared/AuthTests/AuthSandboxSpecs.cs @@ -598,7 +598,7 @@ public async Task WithTokenId_WhenTryingToPublishToUnspecifiedChannel_ThrowsAbly var token = ably.Auth.RequestTokenAsync(CreateTokenParams(capability)).Result; - var tokenAbly = new AblyRest(new ClientOptions { Token = token.Token, Environment = "sandbox" }); + var tokenAbly = new AblyRest(new ClientOptions { Token = token.Token, Environment = "lmars-dev" }); var error = await diff --git a/src/IO.Ably.Tests.Shared/ClientOptionsTests.cs b/src/IO.Ably.Tests.Shared/ClientOptionsTests.cs index 138f08fb4..23cc7879a 100644 --- a/src/IO.Ably.Tests.Shared/ClientOptionsTests.cs +++ b/src/IO.Ably.Tests.Shared/ClientOptionsTests.cs @@ -42,13 +42,13 @@ public void Options_WithCustomEnvironment() { var options = new ClientOptions { - Environment = "sandbox" + Environment = "lmars-dev" }; - options.FullRealtimeHost().Should().Be("sandbox-realtime.ably.io"); - options.FullRestHost().Should().Be("sandbox-rest.ably.io"); + options.FullRealtimeHost().Should().Be("lmars-dev-realtime.ably.io"); + options.FullRestHost().Should().Be("lmars-dev-rest.ably.io"); options.Port.Should().Be(80); options.TlsPort.Should().Be(443); - Assert.Equal(Defaults.GetEnvironmentFallbackHosts("sandbox"), options.GetFallbackHosts()); + Assert.Equal(Defaults.GetEnvironmentFallbackHosts("lmars-dev"), options.GetFallbackHosts()); options.Tls.Should().BeTrue(); } diff --git a/src/IO.Ably.Tests.Shared/DefaultTests.cs b/src/IO.Ably.Tests.Shared/DefaultTests.cs index 00c571f90..030415123 100644 --- a/src/IO.Ably.Tests.Shared/DefaultTests.cs +++ b/src/IO.Ably.Tests.Shared/DefaultTests.cs @@ -27,13 +27,13 @@ public void Defaults_WithEnvironment_ReturnsEnvironmentFallbackHosts() { var expectedFallBackHosts = new[] { - "sandbox-a-fallback.ably-realtime.com", - "sandbox-b-fallback.ably-realtime.com", - "sandbox-c-fallback.ably-realtime.com", - "sandbox-d-fallback.ably-realtime.com", - "sandbox-e-fallback.ably-realtime.com", + "lmars-dev-a-fallback.ably-realtime.com", + "lmars-dev-b-fallback.ably-realtime.com", + "lmars-dev-c-fallback.ably-realtime.com", + "lmars-dev-d-fallback.ably-realtime.com", + "lmars-dev-e-fallback.ably-realtime.com", }; - var fallbackHosts = Defaults.GetEnvironmentFallbackHosts("sandbox"); + var fallbackHosts = Defaults.GetEnvironmentFallbackHosts("lmars-dev"); Assert.Equal(expectedFallBackHosts, fallbackHosts); } diff --git a/src/IO.Ably.Tests.Shared/Infrastructure/AblyCollectionFixture.cs b/src/IO.Ably.Tests.Shared/Infrastructure/AblyCollectionFixture.cs index c50949a21..262a48ff6 100644 --- a/src/IO.Ably.Tests.Shared/Infrastructure/AblyCollectionFixture.cs +++ b/src/IO.Ably.Tests.Shared/Infrastructure/AblyCollectionFixture.cs @@ -51,7 +51,7 @@ public class TestEnvironmentSettings public bool Tls { get; set; } - public string Environment { get; set; } = "sandbox"; + public string Environment { get; set; } = "lmars-dev"; public CipherParams CipherParams { get; set; } diff --git a/src/IO.Ably.Tests.Shared/Infrastructure/AblySandboxFixture.cs b/src/IO.Ably.Tests.Shared/Infrastructure/AblySandboxFixture.cs index 29076cbb9..375ff395f 100644 --- a/src/IO.Ably.Tests.Shared/Infrastructure/AblySandboxFixture.cs +++ b/src/IO.Ably.Tests.Shared/Infrastructure/AblySandboxFixture.cs @@ -15,7 +15,7 @@ public class AblySandboxFixture public static async Task GetSettings(string environment = null) { - environment = environment ?? "sandbox"; + environment = environment ?? "lmars-dev"; if (Settings.ContainsKey(environment)) { return Settings[environment]; @@ -25,7 +25,7 @@ public static async Task GetSettings(string environment return Settings[environment]; } - private static async Task Initialise(string environment = "sandbox") + private static async Task Initialise(string environment = "lmars-dev") { var settings = new TestEnvironmentSettings { diff --git a/src/IO.Ably.Tests.Shared/Realtime/ConnectionSpecs/ConnectionFallbackSpecs.cs b/src/IO.Ably.Tests.Shared/Realtime/ConnectionSpecs/ConnectionFallbackSpecs.cs index ad312a2ef..c1f7c627d 100644 --- a/src/IO.Ably.Tests.Shared/Realtime/ConnectionSpecs/ConnectionFallbackSpecs.cs +++ b/src/IO.Ably.Tests.Shared/Realtime/ConnectionSpecs/ConnectionFallbackSpecs.cs @@ -62,7 +62,7 @@ public async Task WithFallbackHostsUseDefault_ConnectionGoesStraightToFailedInst [Trait("spec", "RTN17b")] public async Task WithCustomEnvironmentAndError_ConnectionGoesStraightToFailedInsteadOfDisconnected() { - var client = await GetConnectedClient(opts => opts.Environment = "sandbox"); + var client = await GetConnectedClient(opts => opts.Environment = "lmars-dev"); client.FakeProtocolMessageReceived(new ProtocolMessage(ProtocolMessage.MessageAction.Error) { diff --git a/src/IO.Ably.Tests.Shared/Rest/ChannelSandboxSpecs.cs b/src/IO.Ably.Tests.Shared/Rest/ChannelSandboxSpecs.cs index 7688292e8..ae3d7b134 100644 --- a/src/IO.Ably.Tests.Shared/Rest/ChannelSandboxSpecs.cs +++ b/src/IO.Ably.Tests.Shared/Rest/ChannelSandboxSpecs.cs @@ -219,7 +219,7 @@ public async Task IdempotentPublishing_SimulateErrorAndRetry(Protocol protocol) const int numberOfRetries = 2; var client = await GetRestClient(protocol, opts => { - opts.FallbackHosts = new[] { "sandbox-rest.ably.io" }; + opts.FallbackHosts = new[] { "lmars-dev-rest.ably.io" }; opts.IdempotentRestPublishing = true; }); @@ -278,7 +278,7 @@ public async Task IdempotentPublishing_WithClientSpecificMessage_ShouldRetry(Pro const int numberOfRetries = 2; var client = await GetRestClient(protocol, opts => { - opts.FallbackHosts = new[] { "sandbox-rest.ably.io" }; + opts.FallbackHosts = new[] { "lmars-dev-rest.ably.io" }; opts.IdempotentRestPublishing = true; }); diff --git a/src/IO.Ably.Tests.Shared/Rest/JwtSandboxSpec.cs b/src/IO.Ably.Tests.Shared/Rest/JwtSandboxSpec.cs index 2cb96e581..929c628f0 100644 --- a/src/IO.Ably.Tests.Shared/Rest/JwtSandboxSpec.cs +++ b/src/IO.Ably.Tests.Shared/Rest/JwtSandboxSpec.cs @@ -128,7 +128,7 @@ public async Task Jwt_Request_ReturnType(Protocol protocol) var authParams = new Dictionary { - ["environment"] = "sandbox", + ["environment"] = "lmars-dev", ["keyName"] = key, ["keySecret"] = secret, ["returnType"] = "jwt" @@ -209,7 +209,7 @@ private async Task GetJwtStringAsync( query["capability"] = capability; query["jwtType"] = jwtType; query["encrypted"] = encrypted.ToString(); - query["environment"] = "sandbox"; + query["environment"] = "lmars-dev"; builder.Query = query.ToQueryString(); var jwtStr = await _httpClient.GetStringAsync(builder.Uri); diff --git a/src/IO.Ably.Tests.Shared/Rest/RestSpecs.cs b/src/IO.Ably.Tests.Shared/Rest/RestSpecs.cs index 4e02013d9..c3b18afcb 100644 --- a/src/IO.Ably.Tests.Shared/Rest/RestSpecs.cs +++ b/src/IO.Ably.Tests.Shared/Rest/RestSpecs.cs @@ -326,7 +326,7 @@ public async Task WithEnvironmentAndCustomHost_ShouldUseCustomHostAsIs() { var client = CreateClient(options => { - options.Environment = "sandbox"; + options.Environment = "lmars-dev"; options.RestHost = "www.test.com"; }); await MakeAnyRequest(client); diff --git a/unity/Assets/Tests/AblySandbox/AblyCollectionFixture.cs b/unity/Assets/Tests/AblySandbox/AblyCollectionFixture.cs index 0b3dd2f34..e2b267f15 100644 --- a/unity/Assets/Tests/AblySandbox/AblyCollectionFixture.cs +++ b/unity/Assets/Tests/AblySandbox/AblyCollectionFixture.cs @@ -29,7 +29,7 @@ public class TestEnvironmentSettings public bool Tls { get; set; } - public string Environment { get; set; } = "sandbox"; + public string Environment { get; set; } = "lmars-dev"; public CipherParams CipherParams { get; set; } diff --git a/unity/Assets/Tests/AblySandbox/AblySandboxFixture.cs b/unity/Assets/Tests/AblySandbox/AblySandboxFixture.cs index f41da0ffd..2e8d7e60d 100644 --- a/unity/Assets/Tests/AblySandbox/AblySandboxFixture.cs +++ b/unity/Assets/Tests/AblySandbox/AblySandboxFixture.cs @@ -16,13 +16,13 @@ public class AblySandboxFixture public async Task GetSettings(string environment = null) { - environment = environment ?? "sandbox"; + environment = environment ?? "lmars-dev"; if (_settings.ContainsKey(environment)) { return _settings[environment]; } - _settings[environment] = await Initialise("sandbox"); + _settings[environment] = await Initialise("lmars-dev"); return _settings[environment]; } diff --git a/unity/Assets/Tests/EditMode/AuthSandboxSpecs.cs b/unity/Assets/Tests/EditMode/AuthSandboxSpecs.cs index 18103a31c..5d7a5aa56 100644 --- a/unity/Assets/Tests/EditMode/AuthSandboxSpecs.cs +++ b/unity/Assets/Tests/EditMode/AuthSandboxSpecs.cs @@ -671,7 +671,7 @@ public IEnumerator WithTokenId_WhenTryingToPublishToUnspecifiedChannel_ThrowsAbl var token = ably.Auth.RequestTokenAsync(CreateTokenParams(capability), null).Result; - var tokenAbly = new AblyRest(new ClientOptions { Token = token.Token, Environment = "sandbox" }); + var tokenAbly = new AblyRest(new ClientOptions { Token = token.Token, Environment = "lmars-dev" }); var error = await E7Assert.ThrowsAsync(tokenAbly.Channels.Get("boo").PublishAsync("test", "true")); diff --git a/unity/Assets/Tests/PlayMode/AuthSandboxSpecs.cs b/unity/Assets/Tests/PlayMode/AuthSandboxSpecs.cs index a994d4d21..e51a7bfd6 100644 --- a/unity/Assets/Tests/PlayMode/AuthSandboxSpecs.cs +++ b/unity/Assets/Tests/PlayMode/AuthSandboxSpecs.cs @@ -672,7 +672,7 @@ public IEnumerator WithTokenId_WhenTryingToPublishToUnspecifiedChannel_ThrowsAbl var token = ably.Auth.RequestTokenAsync(CreateTokenParams(capability), null).Result; - var tokenAbly = new AblyRest(new ClientOptions { Token = token.Token, Environment = "sandbox" }); + var tokenAbly = new AblyRest(new ClientOptions { Token = token.Token, Environment = "lmars-dev" }); var error = await E7Assert.ThrowsAsync(tokenAbly.Channels.Get("boo").PublishAsync("test", "true")); From d5bb76548a3e48a27978a646715366fa34cf380b Mon Sep 17 00:00:00 2001 From: Lewis Marshall Date: Mon, 12 Aug 2024 19:24:16 +0100 Subject: [PATCH 2/2] WIP use ably-realtime-nonprod.com for fallbacks Signed-off-by: Lewis Marshall --- src/IO.Ably.Shared/Defaults.cs | 10 +++++----- src/IO.Ably.Tests.Shared/DefaultTests.cs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/IO.Ably.Shared/Defaults.cs b/src/IO.Ably.Shared/Defaults.cs index e0fbbc06a..863dda5a5 100644 --- a/src/IO.Ably.Shared/Defaults.cs +++ b/src/IO.Ably.Shared/Defaults.cs @@ -87,11 +87,11 @@ internal static string[] GetEnvironmentFallbackHosts(string environment) { return new[] { - $"{environment}-a-fallback.ably-realtime.com", - $"{environment}-b-fallback.ably-realtime.com", - $"{environment}-c-fallback.ably-realtime.com", - $"{environment}-d-fallback.ably-realtime.com", - $"{environment}-e-fallback.ably-realtime.com", + $"{environment}-a-fallback.ably-realtime-nonprod.com", + $"{environment}-b-fallback.ably-realtime-nonprod.com", + $"{environment}-c-fallback.ably-realtime-nonprod.com", + $"{environment}-d-fallback.ably-realtime-nonprod.com", + $"{environment}-e-fallback.ably-realtime-nonprod.com", }; } } diff --git a/src/IO.Ably.Tests.Shared/DefaultTests.cs b/src/IO.Ably.Tests.Shared/DefaultTests.cs index 030415123..aad8e7667 100644 --- a/src/IO.Ably.Tests.Shared/DefaultTests.cs +++ b/src/IO.Ably.Tests.Shared/DefaultTests.cs @@ -27,11 +27,11 @@ public void Defaults_WithEnvironment_ReturnsEnvironmentFallbackHosts() { var expectedFallBackHosts = new[] { - "lmars-dev-a-fallback.ably-realtime.com", - "lmars-dev-b-fallback.ably-realtime.com", - "lmars-dev-c-fallback.ably-realtime.com", - "lmars-dev-d-fallback.ably-realtime.com", - "lmars-dev-e-fallback.ably-realtime.com", + "lmars-dev-a-fallback.ably-realtime-nonprod.com", + "lmars-dev-b-fallback.ably-realtime-nonprod.com", + "lmars-dev-c-fallback.ably-realtime-nonprod.com", + "lmars-dev-d-fallback.ably-realtime-nonprod.com", + "lmars-dev-e-fallback.ably-realtime-nonprod.com", }; var fallbackHosts = Defaults.GetEnvironmentFallbackHosts("lmars-dev"); Assert.Equal(expectedFallBackHosts, fallbackHosts);