run the schema version test

Signed-off-by: Davanum Srinivas <[email protected]>
microsoft · Mar 28, 2020 · 95efc9d · 95efc9d
1 parent d91ecab
commit 95efc9d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -23,6 +23,7 @@ build_script:
   - go build ./internal/tools/zapdir
   - go test -v ./... -tags admin
   - cd test
+  - go test -v ./internal -tags admin
   - go test -c ./containerd-shim-runhcs-v1/ -tags functional
   - go test -c ./cri-containerd/ -tags functional
   - go test -c ./functional/ -tags functional

diff --git a/test/internal/schemaversion_test.go b/test/internal/schemaversion_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/Microsoft/hcsshim/internal/schema2"
+	"github.com/Microsoft/hcsshim/internal/schemaversion"
 	"github.com/Microsoft/hcsshim/osversion"
 	_ "github.com/Microsoft/hcsshim/test/functional/manifest"
 	"github.com/sirupsen/logrus"
@@ -18,45 +19,45 @@ func TestDetermineSchemaVersion(t *testing.T) {
 	osv := osversion.Get()
 
 	if osv.Build >= osversion.RS5 {
-		if sv := DetermineSchemaVersion(nil); !IsV21(sv) {
+		if sv := schemaversion.DetermineSchemaVersion(nil); !schemaversion.IsV21(sv) {
 			t.Fatalf("expected v2")
 		}
-		if sv := DetermineSchemaVersion(SchemaV21()); !IsV21(sv) {
+		if sv := schemaversion.DetermineSchemaVersion(SchemaV21()); !schemaversion.IsV21(sv) {
 			t.Fatalf("expected requested v2")
 		}
-		if sv := DetermineSchemaVersion(SchemaV10()); !IsV10(sv) {
+		if sv := schemaversion.DetermineSchemaVersion(schemaversion.SchemaV10()); !schemaversion.IsV10(sv) {
 			t.Fatalf("expected requested v1")
 		}
-		if sv := DetermineSchemaVersion(&hcsschema.Version{}); !IsV21(sv) {
+		if sv := schemaversion.DetermineSchemaVersion(&hcsschema.Version{}); !schemaversion.IsV21(sv) {
 			t.Fatalf("expected requested v2")
 		}
 
-		if err := IsSupported(SchemaV21()); err != nil {
+		if err := schemaversion.IsSupported(schemaversion.SchemaV21()); err != nil {
 			t.Fatalf("v2 expected to be supported")
 		}
-		if err := IsSupported(SchemaV10()); err != nil {
+		if err := schemaversion.IsSupported(schemaversion.SchemaV10()); err != nil {
 			t.Fatalf("v1 expected to be supported")
 		}
 
 	} else {
-		if sv := DetermineSchemaVersion(nil); !IsV10(sv) {
+		if sv := schemaversion.DetermineSchemaVersion(nil); !schemaversion.IsV10(sv) {
 			t.Fatalf("expected v1")
 		}
 		// Pre RS5 will downgrade to v1 even if request v2
-		if sv := DetermineSchemaVersion(SchemaV21()); !IsV10(sv) {
+		if sv := schemaversion.DetermineSchemaVersion(schemaversion.SchemaV21()); !schemaversion.IsV10(sv) {
 			t.Fatalf("expected requested v1")
 		}
-		if sv := DetermineSchemaVersion(SchemaV10()); !IsV10(sv) {
+		if sv := schemaversion.DetermineSchemaVersion(schemaversion.SchemaV10()); !schemaversion.IsV10(sv) {
 			t.Fatalf("expected requested v1")
 		}
-		if sv := DetermineSchemaVersion(&hcsschema.Version{}); !IsV10(sv) {
+		if sv := schemaversion.DetermineSchemaVersion(&hcsschema.Version{}); !schemaversion.IsV10(sv) {
 			t.Fatalf("expected requested v1")
 		}
 
-		if err := IsSupported(SchemaV21()); err == nil {
+		if err := schemaversion.IsSupported(schemaversion.SchemaV21()); err == nil {
 			t.Fatalf("didn't expect v2 to be supported")
 		}
-		if err := IsSupported(SchemaV10()); err != nil {
+		if err := schemaversion.IsSupported(schemaversion.SchemaV10()); err != nil {
 			t.Fatalf("v1 expected to be supported")
 		}
 	}