From 7dee686c99063b07cbb71d7498280753bdab2d1d Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Mon, 8 May 2023 15:38:25 +0200 Subject: [PATCH] wip --- extern/boostd-data/docker-compose.yml | 5 ++++- extern/boostd-data/svc/setup_yugabyte_test_util.go | 3 ++- piecedirectory/doctor_test.go | 2 +- piecedirectory/piecedirectory_test.go | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extern/boostd-data/docker-compose.yml b/extern/boostd-data/docker-compose.yml index 0dbd5c831..171b8ce0d 100644 --- a/extern/boostd-data/docker-compose.yml +++ b/extern/boostd-data/docker-compose.yml @@ -4,9 +4,12 @@ services: yugabyte: image: public.ecr.aws/n6b0k8i7/yugabyte-test:x86_64-2.17.2.0 + #image: public.ecr.aws/n6b0k8i7/yugabyte-test:aarch64-2.17.2.0 ports: - 9042:9042 - - 5432:5432 + - 5433:5432 + #- 7000:7000 + - 9000:9000 restart: on-failure go-tests: diff --git a/extern/boostd-data/svc/setup_yugabyte_test_util.go b/extern/boostd-data/svc/setup_yugabyte_test_util.go index 7ab6f10c9..6269ff688 100644 --- a/extern/boostd-data/svc/setup_yugabyte_test_util.go +++ b/extern/boostd-data/svc/setup_yugabyte_test_util.go @@ -85,6 +85,7 @@ func awaitYugabyteUp(t *testing.T, duration time.Duration) { for { session, err := cluster.CreateSession() if err == nil { + time.Sleep(5 * time.Second) return } _ = session @@ -93,6 +94,6 @@ func awaitYugabyteUp(t *testing.T, duration time.Duration) { if time.Since(start) > duration { t.Fatalf("failed to start yugabyte within %s", duration) } - time.Sleep(time.Second) + time.Sleep(5 * time.Second) } } diff --git a/piecedirectory/doctor_test.go b/piecedirectory/doctor_test.go index 2150eceab..e931a87b0 100644 --- a/piecedirectory/doctor_test.go +++ b/piecedirectory/doctor_test.go @@ -92,7 +92,7 @@ func TestPieceDoctor(t *testing.T) { prev := yugabyte.MinPieceCheckPeriod yugabyte.MinPieceCheckPeriod = 1 * time.Second - // svc.SetupYugabyte(t) + svc.SetupYugabyte(t) bdsvc := svc.NewYugabyte(yugabyte.DBSettings{ Hosts: []string{"yugabyte"}, diff --git a/piecedirectory/piecedirectory_test.go b/piecedirectory/piecedirectory_test.go index 572172f53..84e6e831c 100644 --- a/piecedirectory/piecedirectory_test.go +++ b/piecedirectory/piecedirectory_test.go @@ -46,7 +46,7 @@ func TestPieceDirectory(t *testing.T) { }) t.Run("yugabyte", func(t *testing.T) { - // svc.SetupYugabyte(t) + svc.SetupYugabyte(t) bdsvc := svc.NewYugabyte(yugabyte.DBSettings{ Hosts: []string{"yugabyte"},