Updated tests to reflect behavior when updates are off.

kat-co · kat-co · commit f71ac7ae3969 · 2014-08-27T19:55:31.000-05:00
diff --git a/environs/cloudinit/cloudinit_test.go b/environs/cloudinit/cloudinit_test.go
@@ -543,7 +543,7 @@ func (*cloudinitSuite) TestCloudInit(c *gc.C) {
 		if test.cfg.Config != nil {
 			checkEnvConfig(c, test.cfg.Config, configKeyValues, scripts)
 		}
-		checkPackage(c, configKeyValues, "curl", true)
+		checkPackage(c, configKeyValues, "curl", test.cfg.EnableOSRefreshUpdate)
 
 		tag := names.NewMachineTag(test.cfg.MachineId).String()
 		acfg := getAgentConfig(c, tag, scripts)
diff --git a/provider/local/environ.go b/provider/local/environ.go
@@ -123,24 +123,10 @@ func (env *localEnviron) Bootstrap(
 		return "", "", nil, err
 	}
 
-	configAttrs := env.Config().AllAttrs()
-	toApply := map[string]interface{}{
+	cfg, err := env.Config().Apply(map[string]interface{}{
 		// Record the bootstrap IP, so the containers know where to go for storage.
 		"bootstrap-ip": env.bridgeAddress,
-	}
-
-	setIfNot := func(key string, value interface{}) {
-		if _, ok := configAttrs[key]; !ok {
-			toApply[key] = value
-		}
-	}
-
-	// Since Juju's state machine is currently the host machine
-	// for local providers, don't stomp on it.
-	setIfNot("enable-os-refresh-update", false)
-	setIfNot("enable-os-upgrade", false)
-
-	cfg, err := env.Config().Apply(toApply)
+	})
 	if err == nil {
 		err = env.SetConfig(cfg)
 	}
@@ -159,8 +145,7 @@ func (env *localEnviron) finishBootstrap(ctx environs.BootstrapContext, mcfg *cl
 	mcfg.LogDir = fmt.Sprintf("/var/log/juju-%s", env.config.namespace())
 	mcfg.Jobs = []params.MachineJob{params.JobManageEnviron}
 	mcfg.CloudInitOutputLog = filepath.Join(mcfg.DataDir, "cloud-init-output.log")
-	mcfg.EnableOSRefreshUpdate = env.config.Config.EnableOSRefreshUpdate()
-	mcfg.EnableOSUpgrade = env.config.Config.EnableOSUpgrade()
+
 	mcfg.MachineAgentServiceName = env.machineAgentServiceName()
 	mcfg.AgentEnvironment = map[string]string{
 		agent.Namespace:   env.config.namespace(),
@@ -172,10 +157,27 @@ func (env *localEnviron) finishBootstrap(ctx environs.BootstrapContext, mcfg *cl
 		// the preallocation faster with no disadvantage.
 		agent.MongoOplogSize: "1", // 1MB
 	}
+
 	if err := environs.FinishMachineConfig(mcfg, env.Config()); err != nil {
 		return err
 	}
 
+	// Since Juju's state machine is currently the host machine
+	// for local providers, don't stomp on it.
+	cfgAttrs := env.config.AllAttrs()
+	if val, ok := cfgAttrs["enable-os-refresh-update"].(bool); !ok {
+		logger.Infof("local provider; disabling refreshing OS updates.")
+		mcfg.EnableOSRefreshUpdate = false
+	} else {
+		mcfg.EnableOSRefreshUpdate = val
+	}
+	if val, ok := cfgAttrs["enable-os-upgrade"].(bool); !ok {
+		logger.Infof("local provider; disabling OS upgrades.")
+		mcfg.EnableOSUpgrade = false
+	} else {
+		mcfg.EnableOSUpgrade = val
+	}
+
 	// don't write proxy settings for local machine
 	mcfg.AptProxySettings = proxy.Settings{}
 	mcfg.ProxySettings = proxy.Settings{}
diff --git a/provider/local/environ_test.go b/provider/local/environ_test.go
@@ -194,9 +194,23 @@ func (s *localJujuTestSuite) testBootstrap(c *gc.C, cfg *config.Config) environs
 
 func (s *localJujuTestSuite) TestBootstrap(c *gc.C) {
 
+	minCfg := minimalConfig(c)
+
 	mockFinish := func(ctx environs.BootstrapContext, mcfg *cloudinit.MachineConfig, cloudcfg *coreCloudinit.Config) error {
-		c.Assert(cloudcfg.AptUpdate(), gc.Equals, mcfg.EnableOSRefreshUpdate)
-		c.Assert(cloudcfg.AptUpgrade(), gc.Equals, mcfg.EnableOSUpgrade)
+
+		envCfgAttrs := minCfg.AllAttrs()
+		if val, ok := envCfgAttrs["enable-os-refresh-update"]; !ok {
+			c.Check(cloudcfg.AptUpdate(), gc.Equals, false)
+		} else {
+			c.Check(cloudcfg.AptUpdate(), gc.Equals, val)
+		}
+
+		if val, ok := envCfgAttrs["enable-os-upgrade"]; !ok {
+			c.Check(cloudcfg.AptUpgrade(), gc.Equals, false)
+		} else {
+			c.Check(cloudcfg.AptUpgrade(), gc.Equals, val)
+		}
+
 		if !mcfg.EnableOSRefreshUpdate {
 			c.Assert(cloudcfg.Packages(), gc.HasLen, 0)
 		}
@@ -208,7 +222,6 @@ func (s *localJujuTestSuite) TestBootstrap(c *gc.C) {
 	s.PatchValue(local.ExecuteCloudConfig, mockFinish)
 
 	// Test that defaults are correct.
-	minCfg := minimalConfig(c)
 	s.testBootstrap(c, minCfg)
 
 	// Test that overrides work.

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ func (cloudinitSuite) TestCloudInit(c gc.C) {`
`543`	`543`	`if test.cfg.Config != nil {`
`544`	`544`	`checkEnvConfig(c, test.cfg.Config, configKeyValues, scripts)`
`545`	`545`	`}`
`546`		`- checkPackage(c, configKeyValues, "curl", true)`
	`546`	`+ checkPackage(c, configKeyValues, "curl", test.cfg.EnableOSRefreshUpdate)`
`547`	`547`
`548`	`548`	`tag := names.NewMachineTag(test.cfg.MachineId).String()`
`549`	`549`	`acfg := getAgentConfig(c, tag, scripts)`