|
@@ -5,13 +5,13 @@ import (
|
|
"testing"
|
|
"testing"
|
|
)
|
|
)
|
|
|
|
|
|
-func assertParseRelease(t *testing.T, release string, b *KernelVersionInfo, result int) {
|
|
|
|
|
|
+func assertParseRelease(t *testing.T, release string, b *VersionInfo, result int) {
|
|
var (
|
|
var (
|
|
- a *KernelVersionInfo
|
|
|
|
|
|
+ a *VersionInfo
|
|
)
|
|
)
|
|
a, _ = ParseRelease(release)
|
|
a, _ = ParseRelease(release)
|
|
|
|
|
|
- if r := CompareKernelVersion(a, b); r != result {
|
|
|
|
|
|
+ if r := CompareKernelVersion(*a, *b); r != result {
|
|
t.Fatalf("Unexpected kernel version comparison result for (%v,%v). Found %d, expected %d", release, b, r, result)
|
|
t.Fatalf("Unexpected kernel version comparison result for (%v,%v). Found %d, expected %d", release, b, r, result)
|
|
}
|
|
}
|
|
if a.Flavor != b.Flavor {
|
|
if a.Flavor != b.Flavor {
|
|
@@ -20,13 +20,13 @@ func assertParseRelease(t *testing.T, release string, b *KernelVersionInfo, resu
|
|
}
|
|
}
|
|
|
|
|
|
func TestParseRelease(t *testing.T) {
|
|
func TestParseRelease(t *testing.T) {
|
|
- assertParseRelease(t, "3.8.0", &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}, 0)
|
|
|
|
- assertParseRelease(t, "3.4.54.longterm-1", &KernelVersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
|
|
|
|
- assertParseRelease(t, "3.4.54.longterm-1", &KernelVersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
|
|
|
|
- assertParseRelease(t, "3.8.0-19-generic", &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "-19-generic"}, 0)
|
|
|
|
- assertParseRelease(t, "3.12.8tag", &KernelVersionInfo{Kernel: 3, Major: 12, Minor: 8, Flavor: "tag"}, 0)
|
|
|
|
- assertParseRelease(t, "3.12-1-amd64", &KernelVersionInfo{Kernel: 3, Major: 12, Minor: 0, Flavor: "-1-amd64"}, 0)
|
|
|
|
- assertParseRelease(t, "3.8.0", &KernelVersionInfo{Kernel: 4, Major: 8, Minor: 0}, -1)
|
|
|
|
|
|
+ assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 3, Major: 8, Minor: 0}, 0)
|
|
|
|
+ assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
|
|
|
|
+ assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
|
|
|
|
+ assertParseRelease(t, "3.8.0-19-generic", &VersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "-19-generic"}, 0)
|
|
|
|
+ assertParseRelease(t, "3.12.8tag", &VersionInfo{Kernel: 3, Major: 12, Minor: 8, Flavor: "tag"}, 0)
|
|
|
|
+ assertParseRelease(t, "3.12-1-amd64", &VersionInfo{Kernel: 3, Major: 12, Minor: 0, Flavor: "-1-amd64"}, 0)
|
|
|
|
+ assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 4, Major: 8, Minor: 0}, -1)
|
|
// Errors
|
|
// Errors
|
|
invalids := []string{
|
|
invalids := []string{
|
|
"3",
|
|
"3",
|
|
@@ -42,7 +42,7 @@ func TestParseRelease(t *testing.T) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func assertKernelVersion(t *testing.T, a, b *KernelVersionInfo, result int) {
|
|
|
|
|
|
+func assertKernelVersion(t *testing.T, a, b VersionInfo, result int) {
|
|
if r := CompareKernelVersion(a, b); r != result {
|
|
if r := CompareKernelVersion(a, b); r != result {
|
|
t.Fatalf("Unexpected kernel version comparison result. Found %d, expected %d", r, result)
|
|
t.Fatalf("Unexpected kernel version comparison result. Found %d, expected %d", r, result)
|
|
}
|
|
}
|
|
@@ -50,43 +50,43 @@ func assertKernelVersion(t *testing.T, a, b *KernelVersionInfo, result int) {
|
|
|
|
|
|
func TestCompareKernelVersion(t *testing.T) {
|
|
func TestCompareKernelVersion(t *testing.T) {
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
0)
|
|
0)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 2, Major: 6, Minor: 0},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 2, Major: 6, Minor: 0},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
-1)
|
|
-1)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
- &KernelVersionInfo{Kernel: 2, Major: 6, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
+ VersionInfo{Kernel: 2, Major: 6, Minor: 0},
|
|
1)
|
|
1)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
0)
|
|
0)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 5},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 5},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
1)
|
|
1)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 0, Minor: 20},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 0, Minor: 20},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
-1)
|
|
-1)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 7, Minor: 20},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 7, Minor: 20},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
-1)
|
|
-1)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 20},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 7, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 20},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 7, Minor: 0},
|
|
1)
|
|
1)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 20},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 20},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
1)
|
|
1)
|
|
assertKernelVersion(t,
|
|
assertKernelVersion(t,
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
- &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 20},
|
|
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 0},
|
|
|
|
+ VersionInfo{Kernel: 3, Major: 8, Minor: 20},
|
|
-1)
|
|
-1)
|
|
}
|
|
}
|