Merged 170-bug-1234576-upgrader into 171-bug-1234577-uniter.

Dimiter Naydenov · Dimiter Naydenov · commit 1b31b7649a9d · 2013-10-03T15:27:20.000+02:00
diff --git a/environs/testing/tools.go b/environs/testing/tools.go
@@ -18,6 +18,7 @@ import (
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/log"
+	"launchpad.net/juju-core/state"
 	coretesting "launchpad.net/juju-core/testing"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
@@ -431,3 +432,14 @@ var BootstrapToolsTests = []BootstrapToolsTest{
 		DefaultSeries: "precise",
 		Expect:        []version.Binary{V1001p64},
 	}}
+
+func SetSSLHostnameVerification(c *gc.C, st *state.State, SSLHostnameVerification bool) {
+	envConfig, err := st.EnvironConfig()
+	c.Assert(err, gc.IsNil)
+	attrs := envConfig.AllAttrs()
+	attrs["ssl-hostname-verification"] = SSLHostnameVerification
+	newConfig, err := config.New(config.NoDefaults, attrs)
+	c.Assert(err, gc.IsNil)
+	err = st.SetEnvironConfig(newConfig)
+	c.Assert(err, gc.IsNil)
+}
diff --git a/state/api/upgrader/upgrader_test.go b/state/api/upgrader/upgrader_test.go
@@ -8,7 +8,7 @@ import (
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/environs/config"
+	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
@@ -97,16 +97,7 @@ func (s *upgraderSuite) TestTools(c *gc.C) {
 	c.Assert(stateTools.URL, gc.Not(gc.Equals), "")
 	c.Assert(disableSSLHostnameVerification, jc.IsFalse)
 
-	// Change the environment config to have
-	// "ssl-hostname-verification" false.
-	envConfig, err := s.State.EnvironConfig()
-	c.Assert(err, gc.IsNil)
-	attrs := envConfig.AllAttrs()
-	attrs["ssl-hostname-verification"] = false
-	newConfig, err := config.New(config.NoDefaults, attrs)
-	c.Assert(err, gc.IsNil)
-	err = s.State.SetEnvironConfig(newConfig)
-	c.Assert(err, gc.IsNil)
+	envtesting.SetSSLHostnameVerification(c, s.State, false)
 
 	stateTools, disableSSLHostnameVerification, err = s.st.Tools(s.rawMachine.Tag())
 	c.Assert(err, gc.IsNil)
diff --git a/state/apiserver/upgrader/upgrader_test.go b/state/apiserver/upgrader/upgrader_test.go
@@ -6,7 +6,7 @@ package upgrader_test
 import (
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/environs/config"
+	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
@@ -166,16 +166,7 @@ func (s *upgraderSuite) TestToolsForAgent(c *gc.C) {
 	assertTools()
 	c.Check(results.Results[0].DisableSSLHostnameVerification, jc.IsFalse)
 
-	// Change the environment config to have
-	// "ssl-hostname-verification" false.
-	envConfig, err := s.State.EnvironConfig()
-	c.Assert(err, gc.IsNil)
-	attrs := envConfig.AllAttrs()
-	attrs["ssl-hostname-verification"] = false
-	newConfig, err := config.New(config.NoDefaults, attrs)
-	c.Assert(err, gc.IsNil)
-	err = s.State.SetEnvironConfig(newConfig)
-	c.Assert(err, gc.IsNil)
+	envtesting.SetSSLHostnameVerification(c, s.State, false)
 
 	results, err = s.upgrader.Tools(args)
 	c.Assert(err, gc.IsNil)
diff --git a/worker/upgrader/upgrader.go b/worker/upgrader/upgrader.go
@@ -139,6 +139,9 @@ func (u *Upgrader) loop() error {
 		}
 		if wantVersion != currentTools.Version.Number {
 			logger.Infof("upgrade requested from %v to %v", currentTools.Version, wantVersion)
+			// TODO(dimitern) 2013-10-03 bug #1234715
+			// Add a testing HTTPS storage to verify the
+			// disableSSLHostnameVerification behavior here.
 			wantTools, disableSSLHostnameVerification, err = u.st.Tools(u.tag)
 			if err != nil {
 				// Not being able to lookup Tools is considered fatal
