Skip to content

Commit 3466334

Browse files
committed
fix commit lookup
1 parent d58b313 commit 3466334

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

wasp/comparator/report.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,12 @@ func extractTagsOrCommits(directory string) ([]string, error) {
181181
}
182182

183183
func findLatestCommit(references []string) (string, error) {
184-
refList := strings.Join(references, " ")
184+
if len(references) == 0 {
185+
return "", fmt.Errorf("no references provided")
186+
}
185187

186-
cmd := exec.Command("git", "rev-list", "--topo-order", "--date-order", "-n", "1", refList)
188+
args := append([]string{"rev-list", "--topo-order", "--date-order", "-n", "1"}, references...)
189+
cmd := exec.Command("git", args...)
187190

188191
var stdout, stderr bytes.Buffer
189192
cmd.Stdout = &stdout

wasp/comparator_test.go

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestLokiComparator(t *testing.T) {
4646
},
4747
TestName: "TestLokiComparator",
4848
TestStart: time.Now(),
49-
CommitOrTag: "current",
49+
CommitOrTag: "e7fc5826a572c09f8b93df3b9f674113372ce923",
5050
}
5151

5252
gen.Run(true)
@@ -58,13 +58,11 @@ func TestLokiComparator(t *testing.T) {
5858
path, storeErr := currentReport.Store()
5959
require.NoError(t, storeErr, "failed to store current report", path)
6060

61-
previousRelease := "old-one"
6261
previousReport := comparator.BasicReport{
63-
CommitOrTag: previousRelease,
64-
TestName: "TestLokiComparator",
62+
TestName: "TestLokiComparator",
6563
}
6664
loadErr := previousReport.Load()
67-
require.NoError(t, loadErr, "failed to load previous report", previousRelease)
65+
require.NoError(t, loadErr, "failed to load previous report")
6866

6967
isComparable, isComparableErrs := previousReport.IsComparable(currentReport)
7068
require.True(t, isComparable, "reports are not comparable", isComparableErrs)
@@ -75,15 +73,4 @@ func TestLokiComparator(t *testing.T) {
7573
for i := range currentReport.Results["vu_over_time"] {
7674
require.Equal(t, currentReport.Results["vu_over_time"][i], previousReport.Results["vu_over_time"][i], "vu_over_time results are not the same for given index")
7775
}
78-
79-
//get previous release
80-
//previousRelease := "something"
81-
//previousReport := comparator.BasicReport{}
82-
//loadErr := previousReport.Load()
83-
//require.NoError(t, loadErr, "failed to load previous report", previousRelease)
84-
85-
//
86-
//areTheSame, perfDiffs, compareErr := previousReport.Compare(&currentReport)
87-
//require.NoError(t, compareErr, "failed to compare reports")
88-
//require.True(t, areTheSame, "performance of both reports is not the same", perfDiffs)
8976
}

0 commit comments

Comments
 (0)