mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-10-21 06:25:10 +00:00
Run gofmt and add test to prevent regressions
Run `go fmt ./...` [1] and add a test to the `test` make target that checks if `go fmt` has been run. [1]: http://blog.golang.org/go-fmt-your-code
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
package script
|
||||
|
||||
const (
|
||||
DefaultDockerNetworkMode = "bridge"
|
||||
DefaultDockerNetworkMode = "bridge"
|
||||
)
|
||||
|
||||
// Docker stores the configuration details for
|
||||
// configuring docker container.
|
||||
type Docker struct {
|
||||
// NetworkMode (also known as `--net` option)
|
||||
// Could be set only if Docker is running in privileged mode
|
||||
NetworkMode *string `yaml:"net,omitempty"`
|
||||
// NetworkMode (also known as `--net` option)
|
||||
// Could be set only if Docker is running in privileged mode
|
||||
NetworkMode *string `yaml:"net,omitempty"`
|
||||
|
||||
// Hostname (also known as `--hostname` option)
|
||||
// Could be set only if Docker is running in privileged mode
|
||||
Hostname *string `yaml:"hostname,omitempty"`
|
||||
// Hostname (also known as `--hostname` option)
|
||||
// Could be set only if Docker is running in privileged mode
|
||||
Hostname *string `yaml:"hostname,omitempty"`
|
||||
}
|
||||
|
||||
// DockerNetworkMode returns DefaultNetworkMode
|
||||
@@ -21,10 +21,10 @@ type Docker struct {
|
||||
// DockerNetworkMode returns Docker.NetworkMode
|
||||
// when it is not empty.
|
||||
func DockerNetworkMode(d *Docker) string {
|
||||
if d == nil || d.NetworkMode == nil {
|
||||
return DefaultDockerNetworkMode
|
||||
}
|
||||
return *d.NetworkMode
|
||||
if d == nil || d.NetworkMode == nil {
|
||||
return DefaultDockerNetworkMode
|
||||
}
|
||||
return *d.NetworkMode
|
||||
}
|
||||
|
||||
// DockerNetworkMode returns empty string
|
||||
@@ -32,8 +32,8 @@ func DockerNetworkMode(d *Docker) string {
|
||||
// DockerNetworkMode returns Docker.NetworkMode
|
||||
// when it is not empty.
|
||||
func DockerHostname(d *Docker) string {
|
||||
if d == nil || d.Hostname == nil {
|
||||
return ""
|
||||
}
|
||||
return *d.Hostname
|
||||
if d == nil || d.Hostname == nil {
|
||||
return ""
|
||||
}
|
||||
return *d.Hostname
|
||||
}
|
||||
|
@@ -1,69 +1,69 @@
|
||||
package script
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestDockerNetworkMode(t *testing.T) {
|
||||
var d *Docker
|
||||
var expected string
|
||||
var d *Docker
|
||||
var expected string
|
||||
|
||||
expected = DefaultDockerNetworkMode
|
||||
d = nil
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = DefaultDockerNetworkMode
|
||||
d = nil
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
|
||||
expected = DefaultDockerNetworkMode
|
||||
d = &Docker{}
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = DefaultDockerNetworkMode
|
||||
d = &Docker{}
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
|
||||
expected = DefaultDockerNetworkMode
|
||||
d = &Docker{NetworkMode: nil}
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = DefaultDockerNetworkMode
|
||||
d = &Docker{NetworkMode: nil}
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
|
||||
expected = "bridge"
|
||||
d = &Docker{NetworkMode: &expected}
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = "bridge"
|
||||
d = &Docker{NetworkMode: &expected}
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
|
||||
expected = "host"
|
||||
d = &Docker{NetworkMode: &expected}
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = "host"
|
||||
d = &Docker{NetworkMode: &expected}
|
||||
if actual := DockerNetworkMode(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDockerHostname(t *testing.T) {
|
||||
var d *Docker
|
||||
var expected string
|
||||
var d *Docker
|
||||
var expected string
|
||||
|
||||
expected = ""
|
||||
d = nil
|
||||
if actual := DockerHostname(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = ""
|
||||
d = nil
|
||||
if actual := DockerHostname(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
|
||||
expected = ""
|
||||
d = &Docker{}
|
||||
if actual := DockerHostname(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = ""
|
||||
d = &Docker{}
|
||||
if actual := DockerHostname(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
|
||||
expected = ""
|
||||
d = &Docker{Hostname: nil}
|
||||
if actual := DockerHostname(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = ""
|
||||
d = &Docker{Hostname: nil}
|
||||
if actual := DockerHostname(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
|
||||
expected = "host"
|
||||
d = &Docker{Hostname: &expected}
|
||||
if actual := DockerHostname(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
expected = "host"
|
||||
d = &Docker{Hostname: &expected}
|
||||
if actual := DockerHostname(d); actual != expected {
|
||||
t.Errorf("The result is invalid. [expected: %s][actual: %s]", expected, actual)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user