Started working on add/remove user support

state/apiserver/client/api_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package client_test
 
 import (
         "fmt"
         stdtesting "testing"
         "time"
 
@@ skipping 244 matching lines @@
 //
 // Note that there is nothing special about machine-0
 // here - it's the environment manager in this scenario
 // just because machine 0 has traditionally been the
 // environment manager (bootstrap machine), so is
 // hopefully easier to remember as such.
 func (s *baseSuite) setUpScenario(c *gc.C) (entities []string) {
         add := func(e state.Entity) {
                 entities = append(entities, e.Tag())
         }
-        u, err := s.State.User("admin")
+        u, err := s.State.User(state.AdminUser)
         c.Assert(err, gc.IsNil)
         setDefaultPassword(c, u)
         add(u)
 
         u, err = s.State.AddUser("other", "")
         c.Assert(err, gc.IsNil)
         setDefaultPassword(c, u)
         add(u)
 
         m, err := s.State.AddMachine("quantal", state.JobManageEnviron)
@@ skipping 51 matching lines @@
                 c.Assert(err, gc.IsNil)
                 c.Assert(lu.IsPrincipal(), gc.Equals, false)
                 deployer, ok = lu.DeployerTag()
                 c.Assert(ok, gc.Equals, true)
                 c.Assert(deployer, gc.Equals, fmt.Sprintf("unit-wordpress-%d", i))
                 setDefaultPassword(c, lu)
                 add(lu)
         }
         return
 }