diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 11:39:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 11:39:48 +0200 |
| commit | 45932c123b762cd951856cee1b067eb05f921a00 (patch) | |
| tree | d96ba976157754ea53c6a01862a6316543420e9b | |
| parent | 3bc6a886a03b77e7f27530d058dd3c500d2253ab (diff) | |
| parent | 0e82dece772b37fe9996f28738f80b13749490f2 (diff) | |
| download | podman-45932c123b762cd951856cee1b067eb05f921a00.tar.gz podman-45932c123b762cd951856cee1b067eb05f921a00.tar.bz2 podman-45932c123b762cd951856cee1b067eb05f921a00.zip | |
Merge pull request #5989 from baude/v2intrunrestart
enable run_restart integration tests
| -rw-r--r-- | cmd/podman/containers/start.go | 4 | ||||
| -rw-r--r-- | test/e2e/run_restart_test.go | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index 73f37e51f..381bf8e26 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -20,7 +20,6 @@ var ( Short: "Start one or more containers", Long: startDescription, RunE: start, - Args: cobra.MinimumNArgs(1), Example: `podman start --latest podman start 860a4b231279 5421ab43b45 podman start --interactive --attach imageID`, @@ -72,6 +71,9 @@ func init() { func start(cmd *cobra.Command, args []string) error { 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 { return errors.Errorf("you cannot start and attach multiple containers at once") } diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index 28ab23ab0..8bbdf2056 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -18,7 +18,6 @@ var _ = Describe("Podman run restart containers", func() { ) BeforeEach(func() { - Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) |