Merge pull request #417 from vmarmol/gofmt

Add Gofmt Check
This commit is contained in:
Rohit Jnagal 2015-01-05 11:36:44 -08:00
commit 3483e94539
8 changed files with 26 additions and 7 deletions

View File

@ -11,6 +11,7 @@ before_script:
- sudo service influxdb start
script:
- export PATH=$PATH:$HOME/gopath/bin
- ./deploy/check_gofmt.sh .
- go vet github.com/google/cadvisor/...
- godep go test -v -race -test.short github.com/google/cadvisor/...
- godep go build github.com/google/cadvisor
- go vet github.com/google/cadvisor/...

View File

@ -79,7 +79,7 @@ func TestGetMachineinfo(t *testing.T) {
NumCores: 8,
MemoryCapacity: 31625871360,
DiskMap: map[string]info.DiskInfo{
"8:0": info.DiskInfo{
"8:0": {
Name: "sda",
Major: 8,
Minor: 0,

View File

@ -159,7 +159,7 @@ func (self *dockerContainerHandler) readLibcontainerConfig() (*libcontainer.Conf
// Translate the old config into the new config.
config = oldConfig.Config
for ns, _ := range oldConfig.OldNamespaces {
for ns := range oldConfig.OldNamespaces {
config.Namespaces = append(config.Namespaces, libcontainer.Namespace{
Name: ns,
})

19
deploy/check_gofmt.sh Executable file
View File

@ -0,0 +1,19 @@
#!/bin/bash
# Check usage.
if [ $# -ne 1 ]; then
echo "USAGE: check_gofmt <source directory>"
exit 1
fi
# Check formatting on non Godep'd code.
GOFMT_PATHS=$(find . -not -wholename "*.git*" -not -wholename "*Godeps*" -not -name "." -type d)
# Find any files with gofmt problems
BAD_FILES=$(gofmt -s -l $GOFMT_PATHS)
if [ -n "$BAD_FILES" ]; then
echo "The following files are not properly formatted:"
echo $BAD_FILES
exit 1
fi

View File

@ -76,7 +76,7 @@ func (self *Node) AddNodeCache(c Cache) {
}
func (self *Node) AddPerCoreCache(c Cache) {
for idx, _ := range self.Cores {
for idx := range self.Cores {
self.Cores[idx].Caches = append(self.Cores[idx].Caches, c)
}
}

View File

@ -43,7 +43,7 @@ func serveDockerPage(m manager.Manager, w http.ResponseWriter, u *url.URL) error
data = &pageData{
DisplayName: dockerContainersText,
ParentContainers: []link{
link{
{
Text: dockerContainersText,
Link: DockerPage,
}},

View File

@ -4,7 +4,6 @@ import (
"testing"
"github.com/google/cadvisor/info"
)
func createStats(id int32) *info.ContainerStats {