summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-04-26 10:39:58 -0500
committerBrent Baude <bbaude@redhat.com>2020-04-26 10:44:17 -0500
commit0e82dece772b37fe9996f28738f80b13749490f2 (patch)
tree74499e8f7d35b2f2761713da492acbbb5b960cd1
parent13c1d2c6af211ade30eeb01d02af7fbf94f2582d (diff)
downloadpodman-0e82dece772b37fe9996f28738f80b13749490f2.tar.gz
podman-0e82dece772b37fe9996f28738f80b13749490f2.tar.bz2
podman-0e82dece772b37fe9996f28738f80b13749490f2.zip
enable run_restart integration tests
also, correct arg processing mistake in start Signed-off-by: Brent Baude <bbaude@redhat.com>
-rw-r--r--cmd/podman/containers/start.go4
-rw-r--r--test/e2e/run_restart_test.go1
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)