[lxc-devel] [lxd/master] Support running individual testify test suites
freeekanayaka on Github
lxc-bot at linuxcontainers.org
Fri May 12 11:02:34 UTC 2017
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 924 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170512/bc90d5bc/attachment.bin>
-------------- next part --------------
From 2f5384e2c2ffa9e11f718bc01b7a557291c7b219 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanayaka at canonical.com>
Date: Fri, 12 May 2017 12:57:13 +0200
Subject: [PATCH] Support running individual testify test suites
Since the standard "go test" tool is not aware of testify and since
unit tests using testify are all direct methods of lxdTestSuite, it's
not possible to easily run a particular set of tests in isolation (say
all tests in container_test.go).
This commit changes the test files to declare their own test suite,
based on lxdTestSuite, so now running:
```
go test -v -run TestContainerTestSuite ./lxd
```
or
```
go test -v -run TestDaemonTestSuite ./lxd
```
will only execute the the tests in those suites, as opposed to the
entire suite.
Signed-off-by: Free Ekanayaka <free.ekanayaka at canonical.com>
---
lxd/container_test.go | 38 ++++++++++++++++++++++++--------------
lxd/daemon_test.go | 16 +++++++++++++++-
2 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/lxd/container_test.go b/lxd/container_test.go
index 86279a9..4215f28 100644
--- a/lxd/container_test.go
+++ b/lxd/container_test.go
@@ -2,13 +2,19 @@ package main
import (
"fmt"
+ "testing"
"github.com/lxc/lxd/lxd/types"
"github.com/lxc/lxd/shared"
"github.com/lxc/lxd/shared/api"
+ "github.com/stretchr/testify/suite"
)
-func (suite *lxdTestSuite) TestContainer_ProfilesDefault() {
+type containerTestSuite struct {
+ lxdTestSuite
+}
+
+func (suite *containerTestSuite) TestContainer_ProfilesDefault() {
args := containerArgs{
Ctype: cTypeRegular,
Ephemeral: false,
@@ -31,7 +37,7 @@ func (suite *lxdTestSuite) TestContainer_ProfilesDefault() {
"First profile should be the default profile.")
}
-func (suite *lxdTestSuite) TestContainer_ProfilesMulti() {
+func (suite *containerTestSuite) TestContainer_ProfilesMulti() {
// Create an unprivileged profile
_, err := dbProfileCreate(
suite.d.db,
@@ -67,7 +73,7 @@ func (suite *lxdTestSuite) TestContainer_ProfilesMulti() {
"The container is not privileged (didn't apply the unprivileged profile?).")
}
-func (suite *lxdTestSuite) TestContainer_ProfilesOverwriteDefaultNic() {
+func (suite *containerTestSuite) TestContainer_ProfilesOverwriteDefaultNic() {
args := containerArgs{
Ctype: cTypeRegular,
Ephemeral: false,
@@ -97,7 +103,7 @@ func (suite *lxdTestSuite) TestContainer_ProfilesOverwriteDefaultNic() {
"Container config doesn't overwrite profile config.")
}
-func (suite *lxdTestSuite) TestContainer_LoadFromDB() {
+func (suite *containerTestSuite) TestContainer_LoadFromDB() {
args := containerArgs{
Ctype: cTypeRegular,
Ephemeral: false,
@@ -128,7 +134,7 @@ func (suite *lxdTestSuite) TestContainer_LoadFromDB() {
"The loaded container isn't excactly the same as the created one.")
}
-func (suite *lxdTestSuite) TestContainer_Path_Regular() {
+func (suite *containerTestSuite) TestContainer_Path_Regular() {
// Regular
args := containerArgs{
Ctype: cTypeRegular,
@@ -145,7 +151,7 @@ func (suite *lxdTestSuite) TestContainer_Path_Regular() {
suite.Req.Equal(shared.VarPath("containers", "testFoo2"), containerPath("testFoo2", false))
}
-func (suite *lxdTestSuite) TestContainer_Path_Snapshot() {
+func (suite *containerTestSuite) TestContainer_Path_Snapshot() {
// Snapshot
args := containerArgs{
Ctype: cTypeSnapshot,
@@ -166,7 +172,7 @@ func (suite *lxdTestSuite) TestContainer_Path_Snapshot() {
containerPath("test/snap1", true))
}
-func (suite *lxdTestSuite) TestContainer_LogPath() {
+func (suite *containerTestSuite) TestContainer_LogPath() {
args := containerArgs{
Ctype: cTypeRegular,
Ephemeral: false,
@@ -180,7 +186,7 @@ func (suite *lxdTestSuite) TestContainer_LogPath() {
suite.Req.Equal(shared.VarPath("logs", "testFoo"), c.LogPath())
}
-func (suite *lxdTestSuite) TestContainer_IsPrivileged_Privileged() {
+func (suite *containerTestSuite) TestContainer_IsPrivileged_Privileged() {
args := containerArgs{
Ctype: cTypeRegular,
Ephemeral: false,
@@ -195,7 +201,7 @@ func (suite *lxdTestSuite) TestContainer_IsPrivileged_Privileged() {
suite.Req.Nil(c.Delete(), "Failed to delete the container.")
}
-func (suite *lxdTestSuite) TestContainer_IsPrivileged_Unprivileged() {
+func (suite *containerTestSuite) TestContainer_IsPrivileged_Unprivileged() {
args := containerArgs{
Ctype: cTypeRegular,
Ephemeral: false,
@@ -210,7 +216,7 @@ func (suite *lxdTestSuite) TestContainer_IsPrivileged_Unprivileged() {
suite.Req.Nil(c.Delete(), "Failed to delete the container.")
}
-func (suite *lxdTestSuite) TestContainer_Rename() {
+func (suite *containerTestSuite) TestContainer_Rename() {
args := containerArgs{
Ctype: cTypeRegular,
Ephemeral: false,
@@ -225,7 +231,7 @@ func (suite *lxdTestSuite) TestContainer_Rename() {
suite.Req.Equal(shared.VarPath("containers", "testFoo2"), c.Path())
}
-func (suite *lxdTestSuite) TestContainer_findIdmap_isolated() {
+func (suite *containerTestSuite) TestContainer_findIdmap_isolated() {
c1, err := containerCreateInternal(suite.d, containerArgs{
Ctype: cTypeRegular,
Name: "isol-1",
@@ -266,7 +272,7 @@ func (suite *lxdTestSuite) TestContainer_findIdmap_isolated() {
}
}
-func (suite *lxdTestSuite) TestContainer_findIdmap_mixed() {
+func (suite *containerTestSuite) TestContainer_findIdmap_mixed() {
c1, err := containerCreateInternal(suite.d, containerArgs{
Ctype: cTypeRegular,
Name: "isol-1",
@@ -307,7 +313,7 @@ func (suite *lxdTestSuite) TestContainer_findIdmap_mixed() {
}
}
-func (suite *lxdTestSuite) TestContainer_findIdmap_raw() {
+func (suite *containerTestSuite) TestContainer_findIdmap_raw() {
c1, err := containerCreateInternal(suite.d, containerArgs{
Ctype: cTypeRegular,
Name: "isol-1",
@@ -343,7 +349,7 @@ func (suite *lxdTestSuite) TestContainer_findIdmap_raw() {
}
}
-func (suite *lxdTestSuite) TestContainer_findIdmap_maxed() {
+func (suite *containerTestSuite) TestContainer_findIdmap_maxed() {
maps := []*shared.IdmapSet{}
for i := 0; i < 7; i++ {
@@ -383,3 +389,7 @@ func (suite *lxdTestSuite) TestContainer_findIdmap_maxed() {
}
}
}
+
+func TestContainerTestSuite(t *testing.T) {
+ suite.Run(t, new(containerTestSuite))
+}
diff --git a/lxd/daemon_test.go b/lxd/daemon_test.go
index 948f58a..fa98ec3 100644
--- a/lxd/daemon_test.go
+++ b/lxd/daemon_test.go
@@ -1,6 +1,16 @@
package main
-func (suite *lxdTestSuite) Test_config_value_set_empty_removes_val() {
+import (
+ "testing"
+
+ "github.com/stretchr/testify/suite"
+)
+
+type daemonTestSuite struct {
+ lxdTestSuite
+}
+
+func (suite *daemonTestSuite) Test_config_value_set_empty_removes_val() {
var err error
d := suite.d
@@ -25,3 +35,7 @@ func (suite *lxdTestSuite) Test_config_value_set_empty_removes_val() {
_, present = valMap["core.trust_password"]
suite.Req.False(present)
}
+
+func TestDaemonTestSuite(t *testing.T) {
+ suite.Run(t, new(daemonTestSuite))
+}
More information about the lxc-devel
mailing list