Update and Validate Environ Config in State

cmd/juju/authorisedkeys_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "fmt"
         "strings"
 
         gc "launchpad.net/gocheck"
 
         "launchpad.net/juju-core/juju/osenv"
         jujutesting "launchpad.net/juju-core/juju/testing"
         keymanagerserver "launchpad.net/juju-core/state/apiserver/keymanager"
         keymanagertesting "launchpad.net/juju-core/state/apiserver/keymanager/testing"
-        statetesting "launchpad.net/juju-core/state/testing"
         coretesting "launchpad.net/juju-core/testing"
         "launchpad.net/juju-core/testing/testbase"
         sshtesting "launchpad.net/juju-core/utils/ssh/testing"
 )
 
 type AuthorisedKeysSuite struct {
         testbase.LoggingSuite
         jujuHome *coretesting.FakeHome
 }
 
@@ skipping 69 matching lines @@
         jujutesting.JujuConnSuite
 }
 
 func (s *keySuiteBase) SetUpSuite(c *gc.C) {
         s.JujuConnSuite.SetUpSuite(c)
         s.PatchEnvironment(osenv.JujuEnvEnvKey, "dummyenv")
 }
 
 func (s *keySuiteBase) setAuthorisedKeys(c *gc.C, keys ...string) {
         keyString := strings.Join(keys, "\n")
-        err := statetesting.UpdateConfig(s.State, map[string]interface{}{"authorized-keys": keyString})
+        err := s.State.UpdateEnvironConfig(map[string]interface{}{"authorized-keys": keyString}, nil, nil)
         c.Assert(err, gc.IsNil)
         envConfig, err := s.State.EnvironConfig()
         c.Assert(err, gc.IsNil)
         c.Assert(envConfig.AuthorizedKeys(), gc.Equals, keyString)
 }
 
 func (s *keySuiteBase) assertEnvironKeys(c *gc.C, expected ...string) {
         envConfig, err := s.State.EnvironConfig()
         c.Assert(err, gc.IsNil)
         keys := envConfig.AuthorizedKeys()
@@ skipping 136 matching lines @@
         key1 := sshtesting.ValidKeyOne.Key + " user@host"
         s.setAuthorisedKeys(c, key1)
         _, err := s.State.AddUser("fred", "password")
         c.Assert(err, gc.IsNil)
 
         context, err := coretesting.RunCommand(c, &ImportKeysCommand{}, []string{"--user", "fred", "lp:validuser"})
         c.Assert(err, gc.IsNil)
         c.Assert(coretesting.Stderr(context), gc.Equals, "")
         s.assertEnvironKeys(c, key1, sshtesting.ValidKeyThree.Key)
 }