opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

enable run_restart integration tests

Browse Source 
also, correct arg processing mistake in start

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-04-26 10:39:58 -05:00
parent 13c1d2c6af
commit 0e82dece77
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/containers/start.go
View File

@ -20,7 +20,6 @@ var (
Short: "Start one or more containers", Short: "Start one or more containers",
Long: startDescription, Long: startDescription,
RunE: start, RunE: start,
Args: cobra.MinimumNArgs(1),
Example: `podman start --latest Example: `podman start --latest
podman start 860a4b231279 5421ab43b45 podman start 860a4b231279 5421ab43b45
podman start --interactive --attach imageID`, podman start --interactive --attach imageID`,
@ -72,6 +71,9 @@ func init() {
func start(cmd *cobra.Command, args []string) error { func start(cmd *cobra.Command, args []string) error {
var errs utils.OutputErrors var errs utils.OutputErrors
if len(args) == 0 && !startOptions.Latest {
return errors.New("start requires at least one argument")
}
if len(args) > 1 && startOptions.Attach { if len(args) > 1 && startOptions.Attach {
return errors.Errorf("you cannot start and attach multiple containers at once") return errors.Errorf("you cannot start and attach multiple containers at once")
} }

1
test/e2e/run_restart_test.go
View File

@ -18,7 +18,6 @@ var _ = Describe("Podman run restart containers", func() {
) )
BeforeEach(func() { BeforeEach(func() {
Skip(v2fail)
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)