Merge pull request #3858 from vieux/fix_testexitcode

fix TestExitCode
Upstream-commit: e4b3b391d6d80e1519bb8a9347fae57a25300a79
Component: engine

components/engine/execdriver/lxc/driver.go

@@ -155,7 +155,9 @@ func (d *driver) Run(c *execdriver.Command, startCallback execdriver.StartCallba
 	)
 	go func() {
 		if err := c.Wait(); err != nil {
-			waitErr = err
+			if _, ok := err.(*exec.ExitError); !ok { // Do not propagate the error if it's simply a status code != 0
+				waitErr = err
+			}
 		}
 		close(waitLock)
 	}()