From 24edd769328f10301fce8d8063ce1a6544570af5 Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Thu, 3 Oct 2024 10:54:36 +0200 Subject: [PATCH] Allow for MySQL 8.4 in endtoend tests This allows for running with MySQL 8.4 in these tests by making sure this version number is also ok. Signed-off-by: Dirkjan Bussink --- go/test/endtoend/reparent/plannedreparent/reparent_test.go | 4 ++-- go/test/endtoend/vtorc/readtopologyinstance/main_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go/test/endtoend/reparent/plannedreparent/reparent_test.go b/go/test/endtoend/reparent/plannedreparent/reparent_test.go index 5986056924e..d3907b0bc5b 100644 --- a/go/test/endtoend/reparent/plannedreparent/reparent_test.go +++ b/go/test/endtoend/reparent/plannedreparent/reparent_test.go @@ -473,7 +473,7 @@ func TestFullStatus(t *testing.T) { assert.Equal(t, "ON", primaryStatus.GtidMode) assert.True(t, primaryStatus.LogReplicaUpdates) assert.True(t, primaryStatus.LogBinEnabled) - assert.Regexp(t, `[58]\.[07].*`, primaryStatus.Version) + assert.Regexp(t, `[58]\.[074].*`, primaryStatus.Version) assert.NotEmpty(t, primaryStatus.VersionComment) replicaTablet := tablets[1] @@ -527,7 +527,7 @@ func TestFullStatus(t *testing.T) { assert.Equal(t, "ON", replicaStatus.GtidMode) assert.True(t, replicaStatus.LogReplicaUpdates) assert.True(t, replicaStatus.LogBinEnabled) - assert.Regexp(t, `[58]\.[07].*`, replicaStatus.Version) + assert.Regexp(t, `[58]\.[074].*`, replicaStatus.Version) assert.NotEmpty(t, replicaStatus.VersionComment) } diff --git a/go/test/endtoend/vtorc/readtopologyinstance/main_test.go b/go/test/endtoend/vtorc/readtopologyinstance/main_test.go index 98bf16ec596..fa8dc116782 100644 --- a/go/test/endtoend/vtorc/readtopologyinstance/main_test.go +++ b/go/test/endtoend/vtorc/readtopologyinstance/main_test.go @@ -78,7 +78,7 @@ func TestReadTopologyInstanceBufferable(t *testing.T) { assert.Contains(t, primaryInstance.InstanceAlias, "zone1") assert.NotEqual(t, 0, primaryInstance.ServerID) assert.Greater(t, len(primaryInstance.ServerUUID), 10) - assert.Regexp(t, "[58].[70].*", primaryInstance.Version) + assert.Regexp(t, "[58].[704].*", primaryInstance.Version) assert.NotEmpty(t, primaryInstance.VersionComment) assert.False(t, primaryInstance.ReadOnly) assert.True(t, primaryInstance.LogBinEnabled) @@ -128,7 +128,7 @@ func TestReadTopologyInstanceBufferable(t *testing.T) { assert.Contains(t, replicaInstance.InstanceAlias, "zone1") assert.NotEqual(t, 0, replicaInstance.ServerID) assert.Greater(t, len(replicaInstance.ServerUUID), 10) - assert.Regexp(t, "[58].[70].*", replicaInstance.Version) + assert.Regexp(t, "[58].[704].*", replicaInstance.Version) assert.NotEmpty(t, replicaInstance.VersionComment) assert.True(t, replicaInstance.ReadOnly) assert.True(t, replicaInstance.LogBinEnabled)