From 602802e5f49bc22ff502d03ecf609e58ee42cbe0 Mon Sep 17 00:00:00 2001 From: Rob Mulholand Date: Fri, 26 Oct 2018 14:35:39 -0500 Subject: [PATCH] Don't test order of DB results - reduce flakiness by enabling tests to pass regardless of result order --- pkg/transformers/deal/repository_test.go | 8 ++++---- pkg/transformers/dent/repository_test.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/transformers/deal/repository_test.go b/pkg/transformers/deal/repository_test.go index 75b5b049..b42b4420 100644 --- a/pkg/transformers/deal/repository_test.go +++ b/pkg/transformers/deal/repository_test.go @@ -185,8 +185,8 @@ var _ = Describe("Deal Repository", func() { Expect(err).NotTo(HaveOccurred()) Expect(len(missingHeaders)).To(Equal(2)) - Expect(missingHeaders[0].BlockNumber).To(Equal(startingBlock)) - Expect(missingHeaders[1].BlockNumber).To(Equal(endingBlock)) + Expect(missingHeaders[0].BlockNumber).To(Or(Equal(startingBlock), Equal(endingBlock))) + Expect(missingHeaders[1].BlockNumber).To(Or(Equal(startingBlock), Equal(endingBlock))) }) It("only treats headers as checked if deal have been checked", func() { @@ -220,8 +220,8 @@ var _ = Describe("Deal Repository", func() { missingHeadersNode1, err := dealRepository.MissingHeaders(startingBlock, endingBlock) Expect(err).NotTo(HaveOccurred()) Expect(len(missingHeadersNode1)).To(Equal(2)) - Expect(missingHeadersNode1[0].BlockNumber).To(Equal(startingBlock)) - Expect(missingHeadersNode1[1].BlockNumber).To(Equal(endingBlock)) + Expect(missingHeadersNode1[0].BlockNumber).To(Or(Equal(startingBlock), Equal(endingBlock))) + Expect(missingHeadersNode1[1].BlockNumber).To(Or(Equal(startingBlock), Equal(endingBlock))) missingHeadersNode2, err := dealRepository2.MissingHeaders(startingBlock, endingBlock) Expect(err).NotTo(HaveOccurred()) diff --git a/pkg/transformers/dent/repository_test.go b/pkg/transformers/dent/repository_test.go index efded5e1..65445a11 100644 --- a/pkg/transformers/dent/repository_test.go +++ b/pkg/transformers/dent/repository_test.go @@ -189,8 +189,8 @@ var _ = Describe("Dent Repository", func() { Expect(err).NotTo(HaveOccurred()) Expect(len(missingHeaders)).To(Equal(2)) - Expect(missingHeaders[0].BlockNumber).To(Equal(startingBlock)) - Expect(missingHeaders[1].BlockNumber).To(Equal(endingBlock)) + Expect(missingHeaders[0].BlockNumber).To(Or(Equal(startingBlock), Equal(endingBlock))) + Expect(missingHeaders[1].BlockNumber).To(Or(Equal(startingBlock), Equal(endingBlock))) }) It("only treats headers as checked if dent has been checked", func() { @@ -223,8 +223,8 @@ var _ = Describe("Dent Repository", func() { missingHeadersNode1, err := dentRepository.MissingHeaders(startingBlock, endingBlock) Expect(err).NotTo(HaveOccurred()) Expect(len(missingHeadersNode1)).To(Equal(2)) - Expect(missingHeadersNode1[0].BlockNumber).To(Equal(startingBlock)) - Expect(missingHeadersNode1[1].BlockNumber).To(Equal(endingBlock)) + Expect(missingHeadersNode1[0].BlockNumber).To(Or(Equal(startingBlock), Equal(endingBlock))) + Expect(missingHeadersNode1[1].BlockNumber).To(Or(Equal(startingBlock), Equal(endingBlock))) missingHeadersNode2, err := dentRepository2.MissingHeaders(startingBlock, endingBlock) Expect(err).NotTo(HaveOccurred())