RepoMirrors/go-ceph
1
0
Fork 0
mirror of https://github.com/ceph/go-ceph synced 2025-02-09 06:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

rados: reduce boilerplate in TestGetPoolByName using testify

Browse Source 
Testfiy's assert and require libs have helpful functions for
checking values. Use them to reduce a bunch of boilerplate code in the
TestGetPoolByName function.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2019-12-20 15:01:57 -05:00 committed by Niels de Vos
parent b5a0045d70
commit 15dfd6fc09
1 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
rados/rados_test.go
View File

@ -300,18 +300,11 @@ func (suite *RadosTestSuite) TestGetPoolByName() {
// check that new pool name is unique
new_name := uuid.Must(uuid.NewV4()).String()
for _, poolname := range pools {
if new_name == poolname {
suite.T().Error("Random pool name exists!")
return
}
}
require.NotContains(
suite.T(), pools, new_name, "Random pool name exists!")
pool, _ := suite.conn.GetPoolByName(new_name)
if pool != 0 {
suite.T().Error("Pool does not exist, but was found!")
return
}
assert.Equal(suite.T(), int64(0), pool, "Pool does not exist, but was found!")
// create pool
err = suite.conn.MakePool(new_name)
@ -320,24 +313,12 @@ func (suite *RadosTestSuite) TestGetPoolByName() {
// verify that the new pool name exists
pools, err = suite.conn.ListPools()
assert.NoError(suite.T(), err)
found := false
for _, poolname := range pools {
if new_name == poolname {
found = true
}
}
if !found {
suite.T().Error("Cannot find newly created pool")
}
assert.Contains(
suite.T(), pools, new_name, "Cannot find newly created pool")
pool, err = suite.conn.GetPoolByName(new_name)
assert.NoError(suite.T(), err)
if pool == 0 {
suite.T().Error("Pool not found!")
return
}
assert.NotEqual(suite.T(), int64(0), pool, "Pool not found!")
// delete the pool
err = suite.conn.DeletePool(new_name)
@ -346,23 +327,13 @@ func (suite *RadosTestSuite) TestGetPoolByName() {
// verify that it is gone
pools, err = suite.conn.ListPools()
assert.NoError(suite.T(), err)
found = false
for _, poolname := range pools {
if new_name == poolname {
found = true
}
}
if found {
suite.T().Error("Deleted pool still exists")
}
assert.NotContains(
suite.T(), pools, new_name, "Deleted pool still exists")
pool, err = suite.conn.GetPoolByName(new_name)
if pool != 0 || err == nil {
suite.T().Error("Pool should have been deleted, but was found!")
return
}
assert.Error(suite.T(), err)
assert.Equal(
suite.T(), int64(0), pool, "Pool should have been deleted, but was found!")
}
func (suite *RadosTestSuite) TestGetPoolByID() {