opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix gofmt and lint

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #268
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-02-07 15:31:09 -05:00
committed by Atomic Bot
parent 19840e0b3d
commit 86d549f2cd
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libpod/container_internal.go
View File

@ -424,7 +424,7 @@ func (c *Container) WriteStringToRundir(destFile, output string) (string, error)
return destFileName, nil return destFileName, nil
} }
type resolv struct { type resolvConf struct {
nameServers []string nameServers []string
searchDomains []string searchDomains []string
options []string options []string
@ -477,8 +477,8 @@ func (c *Container) generateResolvConf() (string, error) {
} }
// createResolv creates a resolv struct from an input string // createResolv creates a resolv struct from an input string
func createResolv(input string) resolv { func createResolv(input string) resolvConf {
var resolv resolv var resolv resolvConf
for _, line := range strings.Split(input, "\n") { for _, line := range strings.Split(input, "\n") {
if strings.HasPrefix(line, "search") { if strings.HasPrefix(line, "search") {
fields := strings.Fields(line) fields := strings.Fields(line)
@ -507,7 +507,7 @@ func createResolv(input string) resolv {
} }
//ToString returns a resolv struct in the form of a resolv.conf //ToString returns a resolv struct in the form of a resolv.conf
func (r resolv) ToString() string { func (r resolvConf) ToString() string {
var result string var result string
// Populate the output string with search domains // Populate the output string with search domains
result += fmt.Sprintf("search %s\n", strings.Join(r.searchDomains, " ")) result += fmt.Sprintf("search %s\n", strings.Join(r.searchDomains, " "))

1
libpod/sql_state_internal.go
View File

@ -37,6 +37,7 @@ const (
FROM containers FROM containers
INNER JOIN INNER JOIN
containerState ON containers.Id = containerState.Id ` containerState ON containers.Id = containerState.Id `
// ExistsQuery is a query to check if a pod exists
ExistsQuery = "SELECT 1 FROM pods WHERE Id=?;" ExistsQuery = "SELECT 1 FROM pods WHERE Id=?;"
) )

4
libpod/state_test.go
View File

@ -1119,7 +1119,6 @@ func TestAddPodDuplicateNameFails(t *testing.T) {
err = state.AddPod(testPod2) err = state.AddPod(testPod2)
assert.Error(t, err) assert.Error(t, err)
allPods, err := state.AllPods() allPods, err := state.AllPods()
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 1, len(allPods)) assert.Equal(t, 1, len(allPods))
@ -1160,7 +1159,6 @@ func TestAddPodCtrIDConflictFails(t *testing.T) {
err = state.AddPod(testPod) err = state.AddPod(testPod)
assert.Error(t, err) assert.Error(t, err)
allPods, err := state.AllPods() allPods, err := state.AllPods()
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 0, len(allPods)) assert.Equal(t, 0, len(allPods))
@ -1181,7 +1179,6 @@ func TestAddPodCtrNameConflictFails(t *testing.T) {
err = state.AddPod(testPod) err = state.AddPod(testPod)
assert.Error(t, err) assert.Error(t, err)
allPods, err := state.AllPods() allPods, err := state.AllPods()
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 0, len(allPods)) assert.Equal(t, 0, len(allPods))
@ -1270,7 +1267,6 @@ func TestRemovePodNotEmptyFails(t *testing.T) {
err = state.RemovePod(testPod) err = state.RemovePod(testPod)
assert.Error(t, err) assert.Error(t, err)
allPods, err := state.AllPods() allPods, err := state.AllPods()
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 1, len(allPods)) assert.Equal(t, 1, len(allPods))