Skip to content

Commit 7b2c7e7

Browse files
authored
test: split TestGetVersion; remove toolchain (#1303)
1 parent 1cb97fd commit 7b2c7e7

File tree

5 files changed

+34
-24
lines changed

5 files changed

+34
-24
lines changed

.github/workflows/test.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
go-version:
15-
- 1.22
1615
- oldstable
1716
- stable
1817
steps:

cli/main_go124_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//go:build go1.24
2+
3+
package cli
4+
5+
import "testing"
6+
7+
func TestGetDevelopmentVersion(t *testing.T) {
8+
got := getVersion(defaultBuilder, defaultDate, defaultCommit, defaultVersion)
9+
want := "version (devel)\n"
10+
11+
if got != want {
12+
t.Errorf("getVersion() = %q, want %q", got, want)
13+
}
14+
}

cli/main_pre_go124_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//go:build !go1.24
2+
3+
package cli
4+
5+
import "testing"
6+
7+
func TestGetDevelopmentVersion(t *testing.T) {
8+
got := getVersion(defaultBuilder, defaultDate, defaultCommit, defaultVersion)
9+
want := "version \n"
10+
11+
if got != want {
12+
t.Errorf("getVersion() = %q, want %q", got, want)
13+
}
14+
}

cli/main_test.go

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package cli
22

33
import (
4-
goversion "go/version"
54
"os"
65
"path/filepath"
76
"runtime"
@@ -96,28 +95,14 @@ func TestXDGConfigDirNoFile(t *testing.T) {
9695
}
9796
}
9897

99-
func TestGetVersion(t *testing.T) {
100-
t.Run("Development version", func(t *testing.T) {
101-
got := getVersion(defaultBuilder, defaultDate, defaultCommit, defaultVersion)
102-
want := "version (devel)\n"
103-
if goversion.Compare(runtime.Version(), "go1.24") < 0 {
104-
want = "version \n"
105-
}
106-
107-
if got != want {
108-
t.Errorf("getVersion() = %q, want %q", got, want)
109-
}
110-
})
111-
112-
t.Run("Release version", func(t *testing.T) {
113-
got := getVersion("builder", "2024-11-15 10:52 UTC", "7ee4500e125e2d1b12653b2c8e140fec380919b4", "v1.5.0-12-g7ee4500-dev")
114-
want := `Version: v1.5.0-12-g7ee4500-dev
98+
func TestGetReleaseVersion(t *testing.T) {
99+
got := getVersion("builder", "2024-11-15 10:52 UTC", "7ee4500e125e2d1b12653b2c8e140fec380919b4", "v1.5.0-12-g7ee4500-dev")
100+
want := `Version: v1.5.0-12-g7ee4500-dev
115101
Commit: 7ee4500e125e2d1b12653b2c8e140fec380919b4
116102
Built 2024-11-15 10:52 UTC by builder
117103
`
118104

119-
if got != want {
120-
t.Errorf("getVersion() = %q, want %q", got, want)
121-
}
122-
})
105+
if got != want {
106+
t.Errorf("getVersion() = %q, want %q", got, want)
107+
}
123108
}

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module github.com/mgechev/revive
22

33
go 1.23.0
44

5-
toolchain go1.24.2
6-
75
require (
86
github.com/BurntSushi/toml v1.5.0
97
github.com/chavacava/garif v0.1.0

0 commit comments

Comments
 (0)