From d2eda1a8648b7e6053627e48bf500f9671f0a6c2 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 3 Nov 2017 14:37:22 -0500 Subject: Enhancements to papr tests The PR contains several enhancements to our CI testing. - enable lint testing on Fedora - add Centos Atomic as test platform - integration tests on run on the OS natively (uncontainerized) - builds are done in containers - inclusion of Vagrant file for local testing Signed-off-by: baude Closes: #18 Approved by: mheon --- libpod/oci.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libpod/oci.go') diff --git a/libpod/oci.go b/libpod/oci.go index fd2c3b283..9fa2d3788 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -256,18 +256,18 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string) error // updateContainerStatus retrieves the current status of the container from the // runtime -func (r *OCIRuntime) updateContainerStatus(ctr *Container) error { +// remove nolint when implemented +func (r *OCIRuntime) updateContainerStatus(ctr *Container) error { //nolint return ErrNotImplemented } // startContainer starts the given container -func (r *OCIRuntime) startContainer(ctr *Container) error { +// remove nolint when function is complete +func (r *OCIRuntime) startContainer(ctr *Container) error { //nolint // TODO: streams should probably *not* be our STDIN/OUT/ERR - redirect to buffers? - if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "start", ctr.ID()); err != nil { - return err - } + err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "start", ctr.ID()) // TODO record start time in container struct - return nil + return err } -- cgit v1.2.3-54-g00ecf