Merge pull request #455 from dseevr/ineffassign_fix

*: fix assignments to make the new version of ineffassign happy

Author: Erik Hollensbe

db/test/etcd_test.go

@@ -116,6 +116,7 @@ func (s *testSuite) TestCRUD(c *C) {
 
 	te := newTestEntity("test", "data")
 	path, err := te.Path()
+	c.Assert(err, IsNil)
 	c.Assert(path, Equals, "test/test")
 	c.Assert(volClient.Get(te), NotNil)
 

storage/backend/nfs/nfs.go

@@ -85,7 +85,7 @@ func (d *Driver) mkOpts(do storage.DriverOptions) (string, error) {
 		return "", err
 	}
 
-	host := ""
+	var host string
 
 	if !strings.Contains(do.Source, ":") {
 		res, ok := mapOpts["addr"]

systemtests/integrated_test.go

@@ -354,7 +354,7 @@ func (s *systemtestSuite) TestIntegratedMultipleFileSystems(c *C) {
 
 	c.Assert(s.createVolume("mon0", ext4vol, map[string]string{"filesystem": "ext4"}), IsNil)
 
-	out, err = s.dockerRun("mon0", false, true, ext4vol, "sleep 10m")
+	_, err = s.dockerRun("mon0", false, true, ext4vol, "sleep 10m")
 	c.Assert(err, IsNil)
 
 	out, err = s.vagrant.GetNode("mon0").RunCommandWithOutput("mount -l -t ext4")

systemtests/volsupervisor_test.go

@@ -84,7 +84,7 @@ func (s *systemtestSuite) TestVolsupervisorStopStartSnapshot(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(len(strings.Split(out, "\n")) > 2, Equals, true)
 
-	out, err = s.volcli("volume remove " + fqVolName)
+	_, err = s.volcli("volume remove " + fqVolName)
 	c.Assert(err, IsNil)
 
 	_, err = s.vagrant.GetNode("mon0").RunCommandWithOutput("sudo rbd snap ls policy1." + volName)

watch/watch.go

@@ -110,10 +110,9 @@ func Create(w *Watcher) {
 		}
 	}(w)
 
-	wary, ok := watchers[w.Path]
+	_, ok := watchers[w.Path]
 	if !ok {
-		wary = []*Watcher{}
-		watchers[w.Path] = wary
+		watchers[w.Path] = []*Watcher{}
 	}
 	watchers[w.Path] = append(watchers[w.Path], w)
 }