Skip to content

Commit

Permalink
lvm: fix last failing test
Browse files Browse the repository at this point in the history
  • Loading branch information
avnik committed Oct 17, 2016
1 parent 24550d0 commit 4b4975a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions resource/lvm/lv/lv.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func (r *ResourceLV) Check(resource.Renderer) (resource.TaskStatus, error) {
r.needCreate = !ok
} else {
status.Output = append(status.Output, fmt.Sprintf("group %s not exist, assume that it will be created"))
r.needCreate = true
}

status.DevicePath = fmt.Sprintf("/dev/mapper/%s-%s", r.group, r.name)
Expand Down
4 changes: 2 additions & 2 deletions resource/lvm/lv/lv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ func TestCreateLogicalVolume(t *testing.T) {
volname := "data" // Match with existing name in TESTDATA_VGS, so fool engine to find proper paths, etc
// after creation
lvm, me := testhelpers.MakeLvmWithMockExec()
me.LvsFirstCall = true
me.On("Read", "pvs", mock.Anything).Return(testdata.TESTDATA_PVS, nil)
me.On("Read", "vgs", mock.Anything).Return(testdata.TESTDATA_VGS, nil)
me.On("Read", "lvs", mock.Anything).Return("", nil).Once()
me.On("Read", "lvs", mock.Anything).Return(testdata.TESTDATA_VGS, nil)
me.On("Read", "lvs", mock.Anything).Return(testdata.TESTDATA_LVS, nil)
me.On("Run", "lvcreate", []string{"-n", volname, "-L", "100G", "vg0"}).Return(nil)
me.On("Exists", "/dev/mapper/vg0-data").Return(true, nil)

Expand Down
4 changes: 2 additions & 2 deletions resource/lvm/testhelpers/mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (e *MockExecutor) RunExitCode(prog string, args []string) (int, error) {

func (me *MockExecutor) Read(prog string, args []string) (string, error) {
if me.LvsFirstCall {
// me.LvsFirstCall = false
me.LvsFirstCall = false
return "", nil
}
c := me.Called(prog, args)
Expand Down Expand Up @@ -57,5 +57,5 @@ func (me *MockExecutor) MkdirAll(path string, perm os.FileMode) error {

func (me *MockExecutor) Exists(path string) (bool, error) {
c := me.Called(path)
return c.Bool(0), c.Error(0)
return c.Bool(0), c.Error(1)
}

0 comments on commit 4b4975a

Please sign in to comment.