-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6511 from blackpiglet/improve_ut_coverage
Improve pkg/cmd/cli package UT coverage.
- Loading branch information
Showing
9 changed files
with
374 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
Copyright The Velero Contributors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package restore | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"os" | ||
"os/exec" | ||
"testing" | ||
|
||
flag "github.com/spf13/pflag" | ||
"github.com/stretchr/testify/require" | ||
controllerclient "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
||
"github.com/vmware-tanzu/velero/pkg/builder" | ||
factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" | ||
"github.com/vmware-tanzu/velero/pkg/cmd/cli" | ||
cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" | ||
velerotest "github.com/vmware-tanzu/velero/pkg/test" | ||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" | ||
) | ||
|
||
func TestDeleteCommand(t *testing.T) { | ||
restore1 := "restore-name-1" | ||
restore2 := "restore-name-2" | ||
|
||
// create a factory | ||
f := &factorymocks.Factory{} | ||
|
||
client := velerotest.NewFakeControllerRuntimeClient(t) | ||
client.Create(context.Background(), builder.ForRestore(cmdtest.VeleroNameSpace, restore1).Result(), &controllerclient.CreateOptions{}) | ||
client.Create(context.Background(), builder.ForRestore("default", restore2).Result(), &controllerclient.CreateOptions{}) | ||
|
||
f.On("KubebuilderClient").Return(client, nil) | ||
f.On("Namespace").Return(cmdtest.VeleroNameSpace) | ||
|
||
// create command | ||
c := NewDeleteCommand(f, "velero restore delete") | ||
c.SetArgs([]string{restore1, restore2}) | ||
require.Equal(t, "Delete restores", c.Short) | ||
|
||
o := cli.NewDeleteOptions("restore") | ||
flags := new(flag.FlagSet) | ||
o.BindFlags(flags) | ||
flags.Parse([]string{"--confirm"}) | ||
|
||
args := []string{restore1, restore2} | ||
|
||
e := o.Complete(f, args) | ||
require.Equal(t, nil, e) | ||
|
||
e = o.Validate(c, f, args) | ||
require.Equal(t, nil, e) | ||
|
||
Run(o) | ||
|
||
e = c.Execute() | ||
require.Equal(t, nil, e) | ||
|
||
if os.Getenv(cmdtest.CaptureFlag) == "1" { | ||
return | ||
} | ||
|
||
cmd := exec.Command(os.Args[0], []string{"-test.run=TestDeleteCommand"}...) | ||
cmd.Env = append(os.Environ(), fmt.Sprintf("%s=1", cmdtest.CaptureFlag)) | ||
stdout, _, err := veleroexec.RunCommand(cmd) | ||
if err != nil { | ||
require.Contains(t, stdout, fmt.Sprintf("restores.velero.io \"%s\" not found.", restore2)) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
Copyright The Velero Contributors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package restore | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"os" | ||
"os/exec" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"k8s.io/client-go/rest" | ||
controllerclient "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
||
"github.com/vmware-tanzu/velero/pkg/builder" | ||
factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks" | ||
cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test" | ||
"github.com/vmware-tanzu/velero/pkg/features" | ||
"github.com/vmware-tanzu/velero/pkg/test" | ||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" | ||
) | ||
|
||
func TestNewDescribeCommand(t *testing.T) { | ||
// create a factory | ||
f := &factorymocks.Factory{} | ||
restoreName := "restore-describe-1" | ||
testRestore := builder.ForRestore(cmdtest.VeleroNameSpace, restoreName).Result() | ||
|
||
clientConfig := rest.Config{} | ||
kbClient := test.NewFakeControllerRuntimeClient(t) | ||
kbClient.Create(context.Background(), testRestore, &controllerclient.CreateOptions{}) | ||
|
||
f.On("ClientConfig").Return(&clientConfig, nil) | ||
f.On("Namespace").Return(cmdtest.VeleroNameSpace) | ||
f.On("KubebuilderClient").Return(kbClient, nil) | ||
|
||
// create command | ||
c := NewDescribeCommand(f, "velero restore describe") | ||
assert.Equal(t, "Describe restores", c.Short) | ||
|
||
features.NewFeatureFlagSet("EnableCSI") | ||
defer features.NewFeatureFlagSet() | ||
|
||
c.SetArgs([]string{restoreName}) | ||
e := c.Execute() | ||
assert.NoError(t, e) | ||
|
||
if os.Getenv(cmdtest.CaptureFlag) == "1" { | ||
return | ||
} | ||
cmd := exec.Command(os.Args[0], []string{"-test.run=TestNewDescribeCommand"}...) | ||
cmd.Env = append(os.Environ(), fmt.Sprintf("%s=1", cmdtest.CaptureFlag)) | ||
stdout, _, err := veleroexec.RunCommand(cmd) | ||
|
||
if err == nil { | ||
assert.Contains(t, stdout, fmt.Sprintf("Name: %s", restoreName)) | ||
return | ||
} | ||
t.Fatalf("process ran with err %v, want backups by get()", err) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.