fix typos;

remove unnecessary tests;
go fmt -s
This commit is contained in:
Murat Kabilov 2017-06-08 11:53:57 +02:00 committed by Oleksii Kliukin
parent e104a67260
commit 1540a2ba65
6 changed files with 18 additions and 34 deletions

View File

@ -430,7 +430,7 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
c.logger.Infof("%s service '%s' has been created", role, util.NameFromMeta(service.ObjectMeta))
}
}
// only proceeed further if both old and new load balancer were present
// only proceed further if both old and new load balancer were present
if !(newSpec.Spec.ReplicaLoadBalancer && c.Spec.ReplicaLoadBalancer) {
continue
}

View File

@ -39,7 +39,7 @@ func (c *Cluster) Sync() error {
if c.Service[role] != nil {
// delete the left over replica service
if err := c.deleteService(role); err != nil {
return fmt.Errorf("could not delete obsolete %s service: %v", role)
return fmt.Errorf("could not delete obsolete %s service: %v", role, err)
}
}
continue

View File

@ -109,8 +109,8 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
return fmt.Errorf("could not connect to the volume provider: %v", err)
}
defer func() {
err2 := resizer.DisconnectFromProvider(); if err2 != nil {
c.logger.Errorf("%v", err2)
if err := resizer.DisconnectFromProvider(); err != nil {
c.logger.Errorf("%v", err)
}
}()
}
@ -127,7 +127,7 @@ func (c *Cluster) resizeVolumes(newVolume spec.Volume, resizers []volumes.Volume
if err := c.resizePostgresFilesystem(podName, []filesystems.FilesystemResizer{&filesystems.Ext234Resize{}}); err != nil {
return fmt.Errorf("could not resize the filesystem on pod '%s': %v", podName, err)
}
c.logger.Debugf("filesystem resize successfull on volume %s", pv.Name)
c.logger.Debugf("filesystem resize successful on volume %s", pv.Name)
pv.Spec.Capacity[v1.ResourceStorage] = newQuantity
c.logger.Debugf("updating persistent volume definition for volume %s", pv.Name)
if _, err := c.KubeClient.PersistentVolumes().Update(pv); err != nil {

View File

@ -223,7 +223,7 @@ var unmarshalCluster = []struct {
TeamID: "ACID",
AllowedSourceRanges: []string{"127.0.0.1/32"},
NumberOfInstances: 2,
Users: map[string]UserFlags{"zalando": {"superuser", "createdb"}},
Users: map[string]userFlags{"zalando": {"superuser", "createdb"}},
MaintenanceWindows: []MaintenanceWindow{{
Everyday: false,
Weekday: time.Monday,
@ -282,7 +282,7 @@ var postgresqlList = []struct {
Kind: "List",
APIVersion: "v1",
},
Items: []Postgresql{Postgresql{
Items: []Postgresql{{
TypeMeta: unversioned.TypeMeta{
Kind: "Postgresql",
APIVersion: "acid.zalan.do/v1",
@ -382,7 +382,7 @@ func TestUnmarshalMaintenanceWindow(t *testing.T) {
}
if !reflect.DeepEqual(m, tt.out) {
t.Errorf("Expected maintenace window: %#v, got: %#v", tt.out, m)
t.Errorf("Expected maintenance window: %#v, got: %#v", tt.out, m)
}
}
}

View File

@ -1,7 +1,6 @@
package util
import (
"fmt"
"reflect"
"testing"
@ -26,13 +25,6 @@ var pgUsers = []struct {
MemberOf: []string{}},
"md592f413f3974bdf3799bb6fecb5f9f2c6"}}
var prettyTest = []struct {
in interface{}
out string
}{
{pgUsers, `[{{test password [] []} md587f77988ccb5aa917c93201ba314fcd4} {{test md592f413f3974bdf3799bb6fecb5f9f2c6 [] []} md592f413f3974bdf3799bb6fecb5f9f2c6}]`},
}
var prettyDiffTest = []struct {
inA interface{}
inB interface{}
@ -86,14 +78,6 @@ func TestPGUserPassword(t *testing.T) {
}
}
func TestPretty(t *testing.T) {
for _, tt := range prettyTest {
if actual := Pretty(tt.in); fmt.Sprintf("%v", actual) != tt.out {
t.Errorf("Pretty expected: %s, got: %s", tt.out, actual)
}
}
}
func TestPrettyDiff(t *testing.T) {
for _, tt := range prettyDiffTest {
if actual := PrettyDiff(tt.inA, tt.inB); actual != tt.out {