Merge pull request #1690 from jbbarth/code-formatting
go fmt Upstream-commit: 49d35cc0aed060288a1db8bbb6e23b3c6f7178fc Component: engine
This commit is contained in:
@ -30,7 +30,7 @@ import (
|
||||
|
||||
var (
|
||||
GITCOMMIT string
|
||||
VERSION string
|
||||
VERSION string
|
||||
)
|
||||
|
||||
func (cli *DockerCli) getMethod(name string) (reflect.Method, bool) {
|
||||
|
||||
@ -152,7 +152,6 @@ func TestRunWorkdirExists(t *testing.T) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
func TestRunExit(t *testing.T) {
|
||||
stdin, stdinPipe := io.Pipe()
|
||||
stdout, stdoutPipe := io.Pipe()
|
||||
|
||||
@ -16,7 +16,7 @@ import (
|
||||
|
||||
var (
|
||||
GITCOMMIT string
|
||||
VERSION string
|
||||
VERSION string
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
||||
@ -27,10 +27,9 @@ func setupWorkingDirectory(workdir string) {
|
||||
if workdir == "" {
|
||||
return
|
||||
}
|
||||
syscall.Chdir(workdir)
|
||||
syscall.Chdir(workdir)
|
||||
}
|
||||
|
||||
|
||||
// Takes care of dropping privileges to the desired user
|
||||
func changeUser(u string) {
|
||||
if u == "" {
|
||||
|
||||
Reference in New Issue
Block a user