1
0
mirror of https://github.com/gluster/glusterd2.git synced 2026-02-06 15:46:00 +01:00

closes #19, removed dependency on heketi

Removed the dependency on github.com/ heketi/heketi just for the
Assert() function. 'Borrowed' the implementation from
github.com/heketi/heketi pkg with attribution placed in tests/assert.go

Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
This commit is contained in:
Krishnan Parthasarathi
2015-09-23 12:56:31 +05:30
parent 3f0cd2d94b
commit 72a7aa4ce5
2 changed files with 36 additions and 4 deletions

22
tests/assert.go Normal file
View File

@@ -0,0 +1,22 @@
// From https://github.com/heketi/heketi
package tests
import (
"runtime"
"testing"
)
// Simple assert call for unit and functional tests
func Assert(t *testing.T, b bool) {
if !b {
pc, file, line, _ := runtime.Caller(1)
caller_func_info := runtime.FuncForPC(pc)
t.Errorf("\n\rASSERT:\tfunc (%s) 0x%x\n\r\tFile %s:%d",
caller_func_info.Name(),
pc,
file,
line)
t.FailNow()
}
}

View File

@@ -3,8 +3,7 @@ package volume
import (
"testing"
"github.com/heketi/heketi/tests"
"github.com/heketi/heketi/utils"
"github.com/kshlm/glusterd2/tests"
)
func TestNewVolumeEntry(t *testing.T) {
@@ -82,12 +81,23 @@ func TestNewVolumeEntryFromRequestRedundancy(t *testing.T) {
tests.Assert(t, v.RedundancyCount == 2)
}
func find(haystack []string, needle string) bool {
for _, hay := range haystack {
if hay == needle {
return true
}
}
return false
}
func TestNewVolumeEntryFromRequestBricks(t *testing.T) {
req := VolCreateRequest{}
req.Bricks = []string{"abc", "def"}
v := NewVolumeEntry(req)
tests.Assert(t, utils.SortedStringHas(v.Bricks, "abc"))
tests.Assert(t, utils.SortedStringHas(v.Bricks, "def"))
tests.Assert(t, find(v.Bricks, "abc"))
tests.Assert(t, find(v.Bricks, "def"))
}