Review tweaks.

howbazaar · howbazaar · commit a8ed424fa042 · 2015-01-19T12:13:13.000+13:00
diff --git a/testing/environ_test.go b/testing/environ_test.go
@@ -52,7 +52,7 @@ func (s *fakeHomeSuite) TestFakeHomeSetsConfigJujuHome(c *gc.C) {
 	c.Assert(osenv.JujuHome(), gc.Equals, expected)
 }
 
-func (s *fakeHomeSuite) TestEnvironmentTagValie(c *gc.C) {
+func (s *fakeHomeSuite) TestEnvironmentTagValid(c *gc.C) {
 	asString := testing.EnvironmentTag.String()
 	tag, err := names.ParseEnvironTag(asString)
 	c.Assert(err, jc.ErrorIsNil)
diff --git a/upgrades/agentconfig_test.go b/upgrades/agentconfig_test.go
@@ -242,20 +242,29 @@ func (s *migrateAgentEnvUUIDSuite) primeConfig(c *gc.C) {
 func (s *migrateAgentEnvUUIDSuite) removeEnvUUIDFromAgentConfig(c *gc.C) {
 	// Read the file in as simple map[string]interface{} and delete
 	// the element, and write it back out again.
+
+	// First step, read the file contents.
 	filename := agent.ConfigPath(agent.DefaultDataDir, s.machine.Tag())
 	data, err := ioutil.ReadFile(filename)
-	c.Logf("Data in:\n\n%s\n", data)
 	c.Assert(err, jc.ErrorIsNil)
+	c.Logf("Data in:\n\n%s\n", data)
+
+	// Parse it into the map.
 	var content map[string]interface{}
 	err = goyaml.Unmarshal(data, &content)
 	c.Assert(err, jc.ErrorIsNil)
+
+	// Remove the environment value, and marshal back into bytes.
 	delete(content, "environment")
 	data, err = goyaml.Marshal(content)
 	c.Assert(err, jc.ErrorIsNil)
+
+	// Write the yaml back out remembering to add the format prefix.
 	data = append([]byte("# format 1.18\n"), data...)
 	c.Logf("Data out:\n\n%s\n", data)
 	err = ioutil.WriteFile(filename, data, 0644)
 	c.Assert(err, jc.ErrorIsNil)
+
 	// Reset test attributes.
 	cfg, err := agent.ReadConfig(filename)
 	c.Assert(err, jc.ErrorIsNil)

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func (s fakeHomeSuite) TestFakeHomeSetsConfigJujuHome(c gc.C) {`
`52`	`52`	`c.Assert(osenv.JujuHome(), gc.Equals, expected)`
`53`	`53`	`}`
`54`	`54`
`55`		`-func (s fakeHomeSuite) TestEnvironmentTagValie(c gc.C) {`
	`55`	`+func (s fakeHomeSuite) TestEnvironmentTagValid(c gc.C) {`
`56`	`56`	`asString := testing.EnvironmentTag.String()`
`57`	`57`	`tag, err := names.ParseEnvironTag(asString)`
`58`	`58`	`c.Assert(err, jc.ErrorIsNil)`