Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e2e: fix formatting of comments 

Comments should have a leading space unless the comment is
for special purposes (go:generate, nolint:)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-01-16 12:46:07 +01:00
parent ddde460613
commit 6e5528b650
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/cli-plugins/plugins/nopersistentprerun/main.go
View File

@ -15,7 +15,7 @@ func main() {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "nopersistentprerun", Use: "nopersistentprerun",
Short: "Testing without PersistentPreRun hooks", Short: "Testing without PersistentPreRun hooks",
//PersistentPreRunE: Not specified, we need to test that it works in the absence of an explicit call // PersistentPreRunE: Not specified, we need to test that it works in the absence of an explicit call
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
cli := dockerCli.Client() cli := dockerCli.Client()
ping, err := cli.Ping(context.Background()) ping, err := cli.Ping(context.Background())

30
e2e/internal/fixtures/fixtures.go
View File

@ -10,28 +10,28 @@ import (
) )
const ( const (
//NotaryURL is the location of the notary server // NotaryURL is the location of the notary server
NotaryURL = "https://notary-server:4443" NotaryURL = "https://notary-server:4443"
//EvilNotaryURL is the location of the evil notary server // EvilNotaryURL is the location of the evil notary server
EvilNotaryURL = "https://evil-notary-server:4444" EvilNotaryURL = "https://evil-notary-server:4444"
//AlpineImage is an image in the test registry // AlpineImage is an image in the test registry
AlpineImage = "registry:5000/alpine:3.6" AlpineImage = "registry:5000/alpine:3.6"
//AlpineSha is the sha of the alpine image // AlpineSha is the sha of the alpine image
AlpineSha = "641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d" AlpineSha = "641b95ddb2ea9dc2af1a0113b6b348ebc20872ba615204fbe12148e98fd6f23d"
//BusyboxImage is an image in the test registry // BusyboxImage is an image in the test registry
BusyboxImage = "registry:5000/busybox:1.27.2" BusyboxImage = "registry:5000/busybox:1.27.2"
//BusyboxSha is the sha of the busybox image // BusyboxSha is the sha of the busybox image
BusyboxSha = "030fcb92e1487b18c974784dcc110a93147c9fc402188370fbfd17efabffc6af" BusyboxSha = "030fcb92e1487b18c974784dcc110a93147c9fc402188370fbfd17efabffc6af"
) )
//SetupConfigFile creates a config.json file for testing // SetupConfigFile creates a config.json file for testing
func SetupConfigFile(t *testing.T) fs.Dir { func SetupConfigFile(t *testing.T) fs.Dir {
t.Helper() t.Helper()
return SetupConfigWithNotaryURL(t, "trust_test", NotaryURL) return SetupConfigWithNotaryURL(t, "trust_test", NotaryURL)
} }
//SetupConfigWithNotaryURL creates a config.json file for testing in the given path // SetupConfigWithNotaryURL creates a config.json file for testing in the given path
//with the given notaryURL // with the given notaryURL
func SetupConfigWithNotaryURL(t *testing.T, path, notaryURL string) fs.Dir { func SetupConfigWithNotaryURL(t *testing.T, path, notaryURL string) fs.Dir {
t.Helper() t.Helper()
dir := fs.NewDir(t, path, fs.WithMode(0700), fs.WithFile("config.json", fmt.Sprintf(` dir := fs.NewDir(t, path, fs.WithMode(0700), fs.WithFile("config.json", fmt.Sprintf(`
@ -50,7 +50,7 @@ func SetupConfigWithNotaryURL(t *testing.T, path, notaryURL string) fs.Dir {
return *dir return *dir
} }
//WithConfig sets an environment variable for the docker config location // WithConfig sets an environment variable for the docker config location
func WithConfig(dir string) func(cmd *icmd.Cmd) { func WithConfig(dir string) func(cmd *icmd.Cmd) {
return func(cmd *icmd.Cmd) { return func(cmd *icmd.Cmd) {
env := append(os.Environ(), env := append(os.Environ(),
@ -60,7 +60,7 @@ func WithConfig(dir string) func(cmd *icmd.Cmd) {
} }
} }
//WithPassphrase sets environment variables for passphrases // WithPassphrase sets environment variables for passphrases
func WithPassphrase(rootPwd, repositoryPwd string) func(cmd *icmd.Cmd) { func WithPassphrase(rootPwd, repositoryPwd string) func(cmd *icmd.Cmd) {
return func(cmd *icmd.Cmd) { return func(cmd *icmd.Cmd) {
env := append(os.Environ(), env := append(os.Environ(),
@ -71,7 +71,7 @@ func WithPassphrase(rootPwd, repositoryPwd string) func(cmd *icmd.Cmd) {
} }
} }
//WithTrust sets DOCKER_CONTENT_TRUST to 1 // WithTrust sets DOCKER_CONTENT_TRUST to 1
func WithTrust(cmd *icmd.Cmd) { func WithTrust(cmd *icmd.Cmd) {
env := append(os.Environ(), env := append(os.Environ(),
"DOCKER_CONTENT_TRUST=1", "DOCKER_CONTENT_TRUST=1",
@ -79,7 +79,7 @@ func WithTrust(cmd *icmd.Cmd) {
cmd.Env = append(cmd.Env, env...) cmd.Env = append(cmd.Env, env...)
} }
//WithNotary sets the location of the notary server // WithNotary sets the location of the notary server
func WithNotary(cmd *icmd.Cmd) { func WithNotary(cmd *icmd.Cmd) {
env := append(os.Environ(), env := append(os.Environ(),
"DOCKER_CONTENT_TRUST_SERVER="+NotaryURL, "DOCKER_CONTENT_TRUST_SERVER="+NotaryURL,
@ -87,14 +87,14 @@ func WithNotary(cmd *icmd.Cmd) {
cmd.Env = append(cmd.Env, env...) cmd.Env = append(cmd.Env, env...)
} }
//WithHome sets the HOME environment variable // WithHome sets the HOME environment variable
func WithHome(path string) func(*icmd.Cmd) { func WithHome(path string) func(*icmd.Cmd) {
return func(cmd *icmd.Cmd) { return func(cmd *icmd.Cmd) {
cmd.Env = append(cmd.Env, "HOME="+path) cmd.Env = append(cmd.Env, "HOME="+path)
} }
} }
//WithNotaryServer sets the location of the notary server // WithNotaryServer sets the location of the notary server
func WithNotaryServer(notaryURL string) func(*icmd.Cmd) { func WithNotaryServer(notaryURL string) func(*icmd.Cmd) {
return func(cmd *icmd.Cmd) { return func(cmd *icmd.Cmd) {
env := append(os.Environ(), env := append(os.Environ(),