1. docker
  2. Commit 670fd201dea0396d90127a30d96bb25ae757026f
Browse code

Windows: Fix parsers kernel test

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2015/11/01 03:22:31
Showing 2 changed files
pkg/parsers/kernel/kernel_test.go
History View file @ 670fd20
1 1 
deleted file mode 100644
... ... 
@@ -1,92 +0,0 @@
1 
-package kernel
2 
-
3 
-import (
4 
-	"fmt"
5 
-	"testing"
6 
-)
7 
-
8 
-func assertParseRelease(t *testing.T, release string, b *VersionInfo, result int) {
9 
-	var (
10 
-		a *VersionInfo
11 
-	)
12 
-	a, _ = ParseRelease(release)
13 
-
14 
-	if r := CompareKernelVersion(*a, *b); r != result {
15 
-		t.Fatalf("Unexpected kernel version comparison result for (%v,%v). Found %d, expected %d", release, b, r, result)
16 
-	}
17 
-	if a.Flavor != b.Flavor {
18 
-		t.Fatalf("Unexpected parsed kernel flavor.  Found %s, expected %s", a.Flavor, b.Flavor)
19 
-	}
20 
-}
21 
-
22 
-func TestParseRelease(t *testing.T) {
23 
-	assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 3, Major: 8, Minor: 0}, 0)
24 
-	assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
25 
-	assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
26 
-	assertParseRelease(t, "3.8.0-19-generic", &VersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "-19-generic"}, 0)
27 
-	assertParseRelease(t, "3.12.8tag", &VersionInfo{Kernel: 3, Major: 12, Minor: 8, Flavor: "tag"}, 0)
28 
-	assertParseRelease(t, "3.12-1-amd64", &VersionInfo{Kernel: 3, Major: 12, Minor: 0, Flavor: "-1-amd64"}, 0)
29 
-	assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 4, Major: 8, Minor: 0}, -1)
30 
-	// Errors
31 
-	invalids := []string{
32 
-		"3",
33 
-		"a",
34 
-		"a.a",
35 
-		"a.a.a-a",
36 
-	}
37 
-	for _, invalid := range invalids {
38 
-		expectedMessage := fmt.Sprintf("Can't parse kernel version %v", invalid)
39 
-		if _, err := ParseRelease(invalid); err == nil || err.Error() != expectedMessage {
40 
-
41 
-		}
42 
-	}
43 
-}
44 
-
45 
-func assertKernelVersion(t *testing.T, a, b VersionInfo, result int) {
46 
-	if r := CompareKernelVersion(a, b); r != result {
47 
-		t.Fatalf("Unexpected kernel version comparison result. Found %d, expected %d", r, result)
48 
-	}
49 
-}
50 
-
51 
-func TestCompareKernelVersion(t *testing.T) {
52 
-	assertKernelVersion(t,
53 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
54 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
55 
-		0)
56 
-	assertKernelVersion(t,
57 
-		VersionInfo{Kernel: 2, Major: 6, Minor: 0},
58 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
59 
-		-1)
60 
-	assertKernelVersion(t,
61 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
62 
-		VersionInfo{Kernel: 2, Major: 6, Minor: 0},
63 
-		1)
64 
-	assertKernelVersion(t,
65 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
66 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
67 
-		0)
68 
-	assertKernelVersion(t,
69 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 5},
70 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
71 
-		1)
72 
-	assertKernelVersion(t,
73 
-		VersionInfo{Kernel: 3, Major: 0, Minor: 20},
74 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
75 
-		-1)
76 
-	assertKernelVersion(t,
77 
-		VersionInfo{Kernel: 3, Major: 7, Minor: 20},
78 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
79 
-		-1)
80 
-	assertKernelVersion(t,
81 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
82 
-		VersionInfo{Kernel: 3, Major: 7, Minor: 0},
83 
-		1)
84 
-	assertKernelVersion(t,
85 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
86 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
87 
-		1)
88 
-	assertKernelVersion(t,
89 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
90 
-		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
91 
-		-1)
92 
-}
pkg/parsers/kernel/kernel_unix_test.go
History View file @ 670fd20
93 1 
new file mode 100644
... ... 
@@ -0,0 +1,96 @@
0 
+// +build !windows
1 
+
2 
+package kernel
3 
+
4 
+import (
5 
+	"fmt"
6 
+	"testing"
7 
+)
8 
+
9 
+func assertParseRelease(t *testing.T, release string, b *VersionInfo, result int) {
10 
+	var (
11 
+		a *VersionInfo
12 
+	)
13 
+	a, _ = ParseRelease(release)
14 
+
15 
+	if r := CompareKernelVersion(*a, *b); r != result {
16 
+		t.Fatalf("Unexpected kernel version comparison result for (%v,%v). Found %d, expected %d", release, b, r, result)
17 
+	}
18 
+	if a.Flavor != b.Flavor {
19 
+		t.Fatalf("Unexpected parsed kernel flavor.  Found %s, expected %s", a.Flavor, b.Flavor)
20 
+	}
21 
+}
22 
+
23 
+// TestParseRelease tests the ParseRelease() function
24 
+func TestParseRelease(t *testing.T) {
25 
+	assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 3, Major: 8, Minor: 0}, 0)
26 
+	assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
27 
+	assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
28 
+	assertParseRelease(t, "3.8.0-19-generic", &VersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "-19-generic"}, 0)
29 
+	assertParseRelease(t, "3.12.8tag", &VersionInfo{Kernel: 3, Major: 12, Minor: 8, Flavor: "tag"}, 0)
30 
+	assertParseRelease(t, "3.12-1-amd64", &VersionInfo{Kernel: 3, Major: 12, Minor: 0, Flavor: "-1-amd64"}, 0)
31 
+	assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 4, Major: 8, Minor: 0}, -1)
32 
+	// Errors
33 
+	invalids := []string{
34 
+		"3",
35 
+		"a",
36 
+		"a.a",
37 
+		"a.a.a-a",
38 
+	}
39 
+	for _, invalid := range invalids {
40 
+		expectedMessage := fmt.Sprintf("Can't parse kernel version %v", invalid)
41 
+		if _, err := ParseRelease(invalid); err == nil || err.Error() != expectedMessage {
42 
+
43 
+		}
44 
+	}
45 
+}
46 
+
47 
+func assertKernelVersion(t *testing.T, a, b VersionInfo, result int) {
48 
+	if r := CompareKernelVersion(a, b); r != result {
49 
+		t.Fatalf("Unexpected kernel version comparison result. Found %d, expected %d", r, result)
50 
+	}
51 
+}
52 
+
53 
+// TestCompareKernelVersion tests the CompareKernelVersion() function
54 
+func TestCompareKernelVersion(t *testing.T) {
55 
+	assertKernelVersion(t,
56 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
57 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
58 
+		0)
59 
+	assertKernelVersion(t,
60 
+		VersionInfo{Kernel: 2, Major: 6, Minor: 0},
61 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
62 
+		-1)
63 
+	assertKernelVersion(t,
64 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
65 
+		VersionInfo{Kernel: 2, Major: 6, Minor: 0},
66 
+		1)
67 
+	assertKernelVersion(t,
68 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
69 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
70 
+		0)
71 
+	assertKernelVersion(t,
72 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 5},
73 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
74 
+		1)
75 
+	assertKernelVersion(t,
76 
+		VersionInfo{Kernel: 3, Major: 0, Minor: 20},
77 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
78 
+		-1)
79 
+	assertKernelVersion(t,
80 
+		VersionInfo{Kernel: 3, Major: 7, Minor: 20},
81 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
82 
+		-1)
83 
+	assertKernelVersion(t,
84 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
85 
+		VersionInfo{Kernel: 3, Major: 7, Minor: 0},
86 
+		1)
87 
+	assertKernelVersion(t,
88 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
89 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
90 
+		1)
91 
+	assertKernelVersion(t,
92 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
93 
+		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
94 
+		-1)
95 
+}