Merge pull request #2841 from openSUSE/ginkgo-unit

Update registrar unit tests to match them of cri-o

Makefile

@@ -30,7 +30,6 @@ BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
 ZSHINSTALLDIR=${PREFIX}/share/zsh/site-functions
 
 SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
-PACKAGES ?= $(shell $(GO) list -tags "${BUILDTAGS}" ./... | grep -v github.com/containers/libpod/vendor | grep -v e2e | grep -v system )
 
 COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true)
 GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO})
@@ -172,7 +171,13 @@ testunit: libpodimage ## Run unittest on the built image
 	${CONTAINER_RUNTIME} run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e CGROUP_MANAGER=cgroupfs -e OCI_RUNTIME -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} make localunit
 
 localunit: test/goecho/goecho varlink_generate
-	$(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES)
+	ginkgo \
+		-r \
+		--skipPackage test/e2e,pkg/apparmor \
+		--cover \
+		--covermode atomic \
+		--tags "$(BUILDTAGS)" \
+		--succinct
 	$(MAKE) -C contrib/cirrus/packer test
 
 ginkgo:

pkg/registrar/registrar_test.go

@@ -1,119 +1,213 @@
-package registrar
+package registrar_test
 
 import (
-	"reflect"
 	"testing"
+
+	"github.com/containers/libpod/pkg/registrar"
+	. "github.com/containers/libpod/test/framework"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
-func TestReserve(t *testing.T) {
+// TestRegistrar runs the created specs
-	r := NewRegistrar()
+func TestRegistrar(t *testing.T) {
-
+	RegisterFailHandler(Fail)
-	obj := "test1"
+	RunSpecs(t, "Registrar")
-	if err := r.Reserve("test", obj); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := r.Reserve("test", obj); err != nil {
-		t.Fatal(err)
-	}
-
-	obj2 := "test2"
-	err := r.Reserve("test", obj2)
-	if err == nil {
-		t.Fatalf("expected error when reserving an already reserved name to another object")
-	}
-	if err != ErrNameReserved {
-		t.Fatal("expected `ErrNameReserved` error when attempting to reserve an already reserved name")
-	}
 }
 
-func TestRelease(t *testing.T) {
+// nolint: gochecknoglobals
-	r := NewRegistrar()
+var t *TestFramework
-	obj := "testing"
 
-	if err := r.Reserve("test", obj); err != nil {
+var _ = BeforeSuite(func() {
-		t.Fatal(err)
+	t = NewTestFramework(NilFunc, NilFunc)
-	}
+	t.Setup()
-	r.Release("test")
+})
-	r.Release("test") // Ensure there is no panic here
 
-	if err := r.Reserve("test", obj); err != nil {
+var _ = AfterSuite(func() {
-		t.Fatal(err)
+	t.Teardown()
-	}
+})
-}
 
-func TestGetNames(t *testing.T) {
+// The actual test suite
-	r := NewRegistrar()
+var _ = t.Describe("Registrar", func() {
-	obj := "testing"
+	// Constant test data needed by some tests
-	names := []string{"test1", "test2"}
+	const (
+		testKey    = "testKey"
+		testName   = "testName"
+		anotherKey = "anotherKey"
+	)
 
-	for _, name := range names {
+	// The system under test
-		if err := r.Reserve(name, obj); err != nil {
+	var sut *registrar.Registrar
-			t.Fatal(err)
-		}
-	}
-	r.Reserve("test3", "other")
 
-	names2, err := r.GetNames(obj)
+	// Prepare the system under test and register a test name and key before
-	if err != nil {
+	// each test
-		t.Fatal(err)
+	BeforeEach(func() {
+		sut = registrar.NewRegistrar()
+		Expect(sut.Reserve(testName, testKey)).To(BeNil())
+	})
+
+	t.Describe("Reserve", func() {
+		It("should succeed to reserve a new registrar", func() {
+			// Given
+			// When
+			err := sut.Reserve("name", "key")
+
+			// Then
+			Expect(err).To(BeNil())
+		})
+
+		It("should succeed to reserve a registrar twice", func() {
+			// Given
+			// When
+			err := sut.Reserve(testName, testKey)
+
+			// Then
+			Expect(err).To(BeNil())
+		})
+
+		It("should fail to reserve an already reserved registrar", func() {
+			// Given
+			// When
+			err := sut.Reserve(testName, anotherKey)
+
+			// Then
+			Expect(err).NotTo(BeNil())
+			Expect(err).To(Equal(registrar.ErrNameReserved))
+		})
+	})
+
+	t.Describe("Release", func() {
+		It("should succeed to release a registered registrar multiple times", func() {
+			// Given
+			// When
+			// Then
+			sut.Release(testName)
+			sut.Release(testName)
+		})
+
+		It("should succeed to release a unknown registrar multiple times", func() {
+			// Given
+			// When
+			// Then
+			sut.Release(anotherKey)
+			sut.Release(anotherKey)
+		})
+
+		It("should succeed to release and re-register a registrar", func() {
+			// Given
+			// When
+			sut.Release(testName)
+			err := sut.Reserve(testName, testKey)
+
+			// Then
+			Expect(err).To(BeNil())
+		})
+	})
+
+	t.Describe("GetNames", func() {
+		It("should succeed to retrieve a single name for a registrar", func() {
+			// Given
+			// When
+			names, err := sut.GetNames(testKey)
+
+			// Then
+			Expect(err).To(BeNil())
+			Expect(len(names)).To(Equal(1))
+			Expect(names[0]).To(Equal(testName))
+		})
+
+		It("should succeed to retrieve all names for a registrar", func() {
+			// Given
+			testNames := []string{"test1", "test2"}
+			for _, name := range testNames {
+				Expect(sut.Reserve(name, anotherKey)).To(BeNil())
 			}
 
-	if !reflect.DeepEqual(names, names2) {
+			// When
-		t.Fatalf("Exepected: %v, Got: %v", names, names2)
+			names, err := sut.GetNames(anotherKey)
-	}
-}
 
-func TestDelete(t *testing.T) {
+			// Then
-	r := NewRegistrar()
+			Expect(err).To(BeNil())
-	obj := "testing"
+			Expect(len(names)).To(Equal(2))
-	names := []string{"test1", "test2"}
+			Expect(names).To(Equal(testNames))
-	for _, name := range names {
+		})
-		if err := r.Reserve(name, obj); err != nil {
+	})
-			t.Fatal(err)
+
-		}
+	t.Describe("GetNames", func() {
+		It("should succeed to retrieve a single name for a registrar", func() {
+			// Given
+			// When
+			names, err := sut.GetNames(testKey)
+
+			// Then
+			Expect(err).To(BeNil())
+			Expect(len(names)).To(Equal(1))
+			Expect(names[0]).To(Equal(testName))
+		})
+
+		It("should succeed to retrieve all names for a registrar", func() {
+			// Given
+			anotherKey := "anotherKey"
+			testNames := []string{"test1", "test2"}
+			for _, name := range testNames {
+				Expect(sut.Reserve(name, anotherKey)).To(BeNil())
 			}
 
-	r.Reserve("test3", "other")
+			// When
-	r.Delete(obj)
+			names, err := sut.GetNames(anotherKey)
 
-	_, err := r.GetNames(obj)
+			// Then
-	if err == nil {
+			Expect(err).To(BeNil())
-		t.Fatal("expected error getting names for deleted key")
+			Expect(len(names)).To(Equal(2))
-	}
+			Expect(names).To(Equal(testNames))
+		})
+	})
 
-	if err != ErrNoSuchKey {
+	t.Describe("Delete", func() {
-		t.Fatal("expected `ErrNoSuchKey`")
+		It("should succeed to delete a registrar", func() {
-	}
+			// Given
-}
+			// When
+			sut.Delete(testKey)
 
-func TestGet(t *testing.T) {
+			// Then
-	r := NewRegistrar()
+			names, err := sut.GetNames(testKey)
-	obj := "testing"
+			Expect(len(names)).To(BeZero())
-	name := "test"
+			Expect(err).To(Equal(registrar.ErrNoSuchKey))
+		})
+	})
 
-	_, err := r.Get(name)
+	t.Describe("Get", func() {
-	if err == nil {
+		It("should succeed to get a key for a registrar", func() {
-		t.Fatal("expected error when key does not exist")
+			// Given
-	}
+			// When
-	if err != ErrNameNotReserved {
+			key, err := sut.Get(testName)
-		t.Fatal(err)
-	}
 
-	if err := r.Reserve(name, obj); err != nil {
+			// Then
-		t.Fatal(err)
+			Expect(err).To(BeNil())
-	}
+			Expect(key).To(Equal(testKey))
+		})
 
-	if _, err = r.Get(name); err != nil {
+		It("should fail to get a key for a not existing registrar", func() {
-		t.Fatal(err)
+			// Given
-	}
+			// When
+			key, err := sut.Get("notExistingName")
 
-	r.Delete(obj)
+			// Then
-	_, err = r.Get(name)
+			Expect(key).To(BeEmpty())
-	if err == nil {
+			Expect(err).To(Equal(registrar.ErrNameNotReserved))
-		t.Fatal("expected error when key does not exist")
+		})
-	}
+	})
-	if err != ErrNameNotReserved {
+
-		t.Fatal(err)
+	t.Describe("GetAll", func() {
-	}
+		It("should succeed to get all names", func() {
-}
+			// Given
+			// When
+			names := sut.GetAll()
+
+			// Then
+			Expect(len(names)).To(Equal(1))
+			Expect(len(names[testKey])).To(Equal(1))
+			Expect(names[testKey][0]).To(Equal(testName))
+		})
+	})
+})

test/framework/framework.go

@@ -0,0 +1,56 @@
+package framework
+
+import (
+	"fmt"
+
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega"
+)
+
+// TestFramework is used to support commonnly used test features
+type TestFramework struct {
+	setup     func(*TestFramework) error
+	teardown  func(*TestFramework) error
+	TestError error
+}
+
+// NewTestFramework creates a new test framework instance for a given `setup`
+// and `teardown` function
+func NewTestFramework(
+	setup func(*TestFramework) error,
+	teardown func(*TestFramework) error,
+) *TestFramework {
+	return &TestFramework{
+		setup,
+		teardown,
+		fmt.Errorf("error"),
+	}
+}
+
+// NilFn is a convenience function which simply does nothing
+func NilFunc(f *TestFramework) error {
+	return nil
+}
+
+// Setup is the global initialization function which runs before each test
+// suite
+func (t *TestFramework) Setup() {
+	// Global initialization for the whole framework goes in here
+
+	// Setup the actual test suite
+	gomega.Expect(t.setup(t)).To(gomega.Succeed())
+}
+
+// Teardown is the global deinitialization function which runs after each test
+// suite
+func (t *TestFramework) Teardown() {
+	// Global deinitialization for the whole framework goes in here
+
+	// Teardown the actual test suite
+	gomega.Expect(t.teardown(t)).To(gomega.Succeed())
+}
+
+// Describe is a convenience wrapper around the `ginkgo.Describe` function
+func (t *TestFramework) Describe(text string, body func()) bool {
+	return ginkgo.Describe("libpod: "+text, body)
+}