From b35b36e35bc7017d305fbd6ff1037d8c51030509 Mon Sep 17 00:00:00 2001 From: arielshaqed Date: Wed, 25 Nov 2020 13:26:28 +0200 Subject: [PATCH] [CR] Flatten if/elses in catalog/mvcc/cataloger_merge_test.go Co-authored-by: Barak Amar --- catalog/mvcc/cataloger_merge_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/catalog/mvcc/cataloger_merge_test.go b/catalog/mvcc/cataloger_merge_test.go index d9ed6b6ea73..a01a3ad3b1c 100644 --- a/catalog/mvcc/cataloger_merge_test.go +++ b/catalog/mvcc/cataloger_merge_test.go @@ -140,10 +140,9 @@ func TestCataloger_Merge_FromParentConflicts(t *testing.T) { } if res == nil { t.Errorf("Merge returned nil, err %s", err) - } else { - if res.Reference != "" { - t.Errorf("Merge reference = %s, expected to be empty", res.Reference) - } + } else if res.Reference != "" { + t.Errorf("Merge reference = %s, expected to be empty", res.Reference) + } } }