From 065bfe4a89930d3f6a0c22222528e6345f55e959 Mon Sep 17 00:00:00 2001 From: Itamar Yuran Date: Sun, 29 Sep 2024 15:14:43 +0300 Subject: [PATCH] didn't cry, was my fault. eill work now --- esti/lakectl_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/esti/lakectl_test.go b/esti/lakectl_test.go index 6c4ec51d57a..8db7747d819 100644 --- a/esti/lakectl_test.go +++ b/esti/lakectl_test.go @@ -352,8 +352,8 @@ func TestLakectlLogNoMergesWithCommitsAndMerges(t *testing.T) { branchVars := map[string]string{ "REPO": repoName, "STORAGE": storage, - "SOURCE_BRANCH": featureBranch, - "DEST_BRANCH": mainBranch, + "SOURCE_BRANCH": mainBranch, + "DEST_BRANCH": featureBranch, "BRANCH": featureBranch, } @@ -381,6 +381,8 @@ func TestLakectlLogNoMergesWithCommitsAndMerges(t *testing.T) { RunCmdAndVerifySuccessWithFile(t, Lakectl()+" commit lakefs://"+repoName+"/"+featureBranch+" -m \""+commitMessage+"\"", false, "lakectl_commit", branchVars) // merge feature into main + branchVars["SOURCE_BRANCH"] = featureBranch + branchVars["DEST_BRANCH"] = mainBranch RunCmdAndVerifySuccessWithFile(t, Lakectl()+" merge lakefs://"+repoName+"/"+featureBranch+" lakefs://"+repoName+"/"+mainBranch, false, "lakectl_merge_success", branchVars) // log the commits without merges