Implementation of the charm state.

state/internal_test.go

 // launchpad.net/juju/go/state
 //
 // Copyright (c) 2011-2012 Canonical Ltd.
-
 package state
 
 import (
-        "fmt"
         . "launchpad.net/gocheck"
         "launchpad.net/goyaml"
         "launchpad.net/gozk/zookeeper"
-        "testing"
 )
 
-// TestPackage integrates the tests into gotest.
-func TestPackage(t *testing.T) {
-        TestingT(t)
-}
-
 type TopologySuite struct {
         zkServer   *zookeeper.Server
         zkTestRoot string
         zkTestPort int
         zkAddr     string
         zkConn     *zookeeper.Conn
         t          *topology
 }
 
 var _ = Suite(&TopologySuite{})
 
-func (s *TopologySuite) SetUpSuite(c *C) {
-        var err error
-        s.zkTestRoot = c.MkDir() + "/zookeeper"
-        s.zkTestPort = 21812
-        s.zkAddr = fmt.Sprint("localhost:", s.zkTestPort)
-
-        s.zkServer, err = zookeeper.CreateServer(s.zkTestPort, s.zkTestRoot, "")
-        if err != nil {
-                c.Fatal("Cannot set up ZooKeeper server environment: ", err)
-        }
-        err = s.zkServer.Start()
-        if err != nil {
-                c.Fatal("Cannot start ZooKeeper server: ", err)
-        }
-}
-
-func (s *TopologySuite) TearDownSuite(c *C) {
-        if s.zkServer != nil {
-                s.zkServer.Destroy()
-        }
-}
-
 func (s *TopologySuite) SetUpTest(c *C) {
         // Connect the server.
-        _, s.zkConn = OpenAddr(c, s.zkAddr)
+        st, err := Open(&Info{
+                Addrs: []string{ZkAddr},
+        })
+        c.Assert(err, IsNil)
+        s.zkConn = ZkConn(st)
         // Read the toplogy.
-        var err error
         s.t, err = readTopology(s.zkConn)
         c.Assert(err, IsNil)
 }
 
 func (s *TopologySuite) TearDownTest(c *C) {
         // Delete possible nodes, ignore errors.
         zkRemoveTree(s.zkConn, "/topology")
         s.zkConn.Close()
 }
 
 func (s TopologySuite) TestAddMachine(c *C) {
         // Check that adding machines works correctly.
         err := s.t.AddMachine("m-0")
         c.Assert(err, IsNil)
         err = s.t.AddMachine("m-1")
         c.Assert(err, IsNil)
         keys := s.t.MachineKeys()
-        c.Assert(keys, Equals, []string{"m-0", "m-1"})
+        c.Assert(keys, DeepEquals, []string{"m-0", "m-1"})
 }
 
 func (s TopologySuite) TestAddDuplicatedMachine(c *C) {
         // Check that adding a duplicated machine by key fails.
         err := s.t.AddMachine("m-0")
         c.Assert(err, IsNil)
         err = s.t.AddMachine("m-0")
         c.Assert(err, ErrorMatches, `attempted to add duplicated machine "m-0"`)
 }
 
@@ skipping 36 matching lines @@
         _, err = s.t.AddUnit("s-0", "u-1")
         c.Assert(err, IsNil)
         err = s.t.AssignUnitToMachine("s-0", "u-1", "m-0")
         c.Assert(err, IsNil)
         err = s.t.RemoveMachine("m-0")
         c.Assert(err, ErrorMatches, `can't remove machine "m-0" while units ared assigned`)
 }
 
 func (s TopologySuite) TestMachineHasUnits(c *C) {
         // Check various ways a machine might or might not be assigned
-        // to a unit.   
+        // to a unit.   
         err := s.t.AddMachine("m-0")
         c.Assert(err, IsNil)
         err = s.t.AddMachine("m-1")
         c.Assert(err, IsNil)
         err = s.t.AddService("s-0", "wordpress")
         c.Assert(err, IsNil)
         _, err = s.t.AddUnit("s-0", "u-0")
         c.Assert(err, IsNil)
         _, err = s.t.AddUnit("s-0", "u-1")
         c.Assert(err, IsNil)
@@ skipping 17 matching lines @@
         c.Assert(err, IsNil)
         found = s.t.HasMachine("m-0")
         c.Assert(found, Equals, true)
         found = s.t.HasMachine("m-1")
         c.Assert(found, Equals, false)
 }
 
 func (s TopologySuite) TestMachineKeys(c *C) {
         // Check that the retrieval of all services keys works correctly.
         keys := s.t.MachineKeys()
-        c.Assert(keys, Equals, []string{})
+        c.Assert(keys, DeepEquals, []string{})
         err := s.t.AddMachine("m-0")
         c.Assert(err, IsNil)
         err = s.t.AddMachine("m-1")
         c.Assert(err, IsNil)
         keys = s.t.MachineKeys()
-        c.Assert(keys, Equals, []string{"m-0", "m-1"})
+        c.Assert(keys, DeepEquals, []string{"m-0", "m-1"})
 }
 
 func (s TopologySuite) TestAddService(c *C) {
         // Check that adding services works correctly.
         c.Assert(s.t.HasService("s-0"), Equals, false)
         err := s.t.AddService("s-0", "wordpress")
         c.Assert(err, IsNil)
         err = s.t.AddService("s-1", "mysql")
         c.Assert(err, IsNil)
         c.Assert(s.t.HasService("s-0"), Equals, true)
@@ skipping 29 matching lines @@
         err = s.t.AddService("s-0", "wordpress")
         c.Assert(err, IsNil)
         key, err = s.t.ServiceKey("wordpress")
         c.Assert(err, IsNil)
         c.Assert(key, Equals, "s-0")
 }
 
 func (s TopologySuite) TestServiceKeys(c *C) {
         // Check that the retrieval of all services keys works correctly.
         keys := s.t.ServiceKeys()
-        c.Assert(keys, Equals, []string{})
+        c.Assert(keys, DeepEquals, []string{})
         err := s.t.AddService("s-0", "wordpress")
         c.Assert(err, IsNil)
         err = s.t.AddService("s-1", "mysql")
         c.Assert(err, IsNil)
         keys = s.t.ServiceKeys()
-        c.Assert(keys, Equals, []string{"s-0", "s-1"})
+        c.Assert(keys, DeepEquals, []string{"s-0", "s-1"})
 }
 
 func (s TopologySuite) TestServiceName(c *C) {
         // Check that the name retrieval for a service name works correctly.
         name, err := s.t.ServiceName("s-0")
         c.Assert(err, ErrorMatches, `service with key "s-0" not found`)
         err = s.t.AddService("s-0", "wordpress")
         c.Assert(err, IsNil)
         name, err = s.t.ServiceName("s-0")
         c.Assert(err, IsNil)
@@ skipping 28 matching lines @@
         c.Assert(err, IsNil)
         c.Assert(seq, Equals, 0)
         seq, err = s.t.AddUnit("s-0", "u-12")
         c.Assert(err, IsNil)
         c.Assert(seq, Equals, 1)
         seq, err = s.t.AddUnit("s-1", "u-07")
         c.Assert(err, IsNil)
         c.Assert(seq, Equals, 0)
         keys, err := s.t.UnitKeys("s-0")
         c.Assert(err, IsNil)
-        c.Assert(keys, Equals, []string{"u-05", "u-12"})
+        c.Assert(keys, DeepEquals, []string{"u-05", "u-12"})
         keys, err = s.t.UnitKeys("s-1")
         c.Assert(err, IsNil)
-        c.Assert(keys, Equals, []string{"u-07"})
+        c.Assert(keys, DeepEquals, []string{"u-07"})
 }
 
 func (s TopologySuite) TestGlobalUniqueUnitNames(c *C) {
         // Check that even if the underlying service is destroyed
         // and a new one with the same name is created we'll never
         // get a duplicate unit name.
         err := s.t.AddService("s-0", "wordpress")
         c.Assert(err, IsNil)
         seq, err := s.t.AddUnit("s-0", "u-0")
         c.Assert(err, IsNil)
@@ skipping 44 matching lines @@
 }
 
 func (s TopologySuite) TestUnitKeys(c *C) {
         // Check if registered units from a service are returned correctly.
         err := s.t.AddService("s-0", "wordpress")
         c.Assert(err, IsNil)
         err = s.t.AddService("s-1", "mysql")
         c.Assert(err, IsNil)
         units, err := s.t.UnitKeys("s-0")
         c.Assert(err, IsNil)
-        c.Assert(units, Equals, []string{})
+        c.Assert(units, DeepEquals, []string{})
         _, err = s.t.AddUnit("s-0", "u-0")
         c.Assert(err, IsNil)
         _, err = s.t.AddUnit("s-0", "u-1")
         c.Assert(err, IsNil)
         _, err = s.t.AddUnit("s-1", "u-2")
         c.Assert(err, IsNil)
         units, err = s.t.UnitKeys("s-0")
         c.Assert(err, IsNil)
-        c.Assert(units, Equals, []string{"u-0", "u-1"})
+        c.Assert(units, DeepEquals, []string{"u-0", "u-1"})
         units, err = s.t.UnitKeys("s-1")
         c.Assert(err, IsNil)
-        c.Assert(units, Equals, []string{"u-2"})
+        c.Assert(units, DeepEquals, []string{"u-2"})
 }
 
 func (s TopologySuite) TestUnitKeysWithNonExistingService(c *C) {
         // Check if the retrieving of unit keys from a non-existing
         // service fails correctly.
         _, err := s.t.UnitKeys("s-0")
         c.Assert(err, ErrorMatches, `service with key "s-0" not found`)
 }
 
 func (s TopologySuite) TestHasUnit(c *C) {
@@ skipping 103 matching lines @@
         zkTestRoot string
         zkTestPort int
         zkAddr     string
         zkConn     *zookeeper.Conn
         path       string
 }
 
 var _ = Suite(&ConfigNodeSuite{})
 
 func (s *ConfigNodeSuite) SetUpSuite(c *C) {
-        var err error
-        s.zkTestRoot = c.MkDir() + "/zookeeper"
-        s.zkTestPort = 21812
-        s.zkAddr = fmt.Sprint("localhost:", s.zkTestPort)
         s.path = "/config"
-
-        s.zkServer, err = zookeeper.CreateServer(s.zkTestPort, s.zkTestRoot, "")
-        if err != nil {
-                c.Fatal("Cannot set up ZooKeeper server environment: ", err)
-        }
-        err = s.zkServer.Start()
-        if err != nil {
-                c.Fatal("Cannot start ZooKeeper server: ", err)
-        }
-}
-
-func (s *ConfigNodeSuite) TearDownSuite(c *C) {
-        if s.zkServer != nil {
-                s.zkServer.Destroy()
-        }
 }
 
 func (s *ConfigNodeSuite) SetUpTest(c *C) {
-        _, s.zkConn = OpenAddr(c, s.zkAddr)
+        // Connect the server.
+        st, err := Open(&Info{
+                Addrs: []string{ZkAddr},
+        })
+        c.Assert(err, IsNil)
+        s.zkConn = ZkConn(st)
 }
 
 func (s *ConfigNodeSuite) TearDownTest(c *C) {
         // Delete possible nodes, ignore errors.
         zkRemoveTree(s.zkConn, s.path)
         s.zkConn.Close()
 }
 
 func (s ConfigNodeSuite) TestCreateEmptyConfigNode(c *C) {
         // Check that creating an empty node works correctly.
         node, err := createConfigNode(s.zkConn, s.path, nil)
         c.Assert(err, IsNil)
-        c.Assert(node.Keys(), Equals, []string{})
+        c.Assert(node.Keys(), DeepEquals, []string{})
 }
 
 func (s ConfigNodeSuite) TestReadWithoutWrite(c *C) {
         // Check reading without writing.
         node, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         c.Assert(node, Not(IsNil))
 }
 
 func (s ConfigNodeSuite) TestSetWithoutWrite(c *C) {
         // Check that config values can be set.
         _, err := s.zkConn.Create(s.path, "", 0, zkPermAll)
         c.Assert(err, IsNil)
         node, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         options := map[string]interface{}{"alpha": "beta", "one": 1}
         node.Update(options)
-        c.Assert(node.Map(), Equals, options)
+        c.Assert(node.Map(), DeepEquals, options)
         // Node data has to be empty.
         yaml, _, err := s.zkConn.Get("/config")
         c.Assert(err, IsNil)
         c.Assert(yaml, Equals, "")
 }
 
 func (s ConfigNodeSuite) TestSetWithWrite(c *C) {
         // Check that write updates the local and the ZooKeeper state.
         node, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         options := map[string]interface{}{"alpha": "beta", "one": 1}
         node.Update(options)
         changes, err := node.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "alpha", nil, "beta"},
-                ItemChange{ItemAdded, "one", nil, 1},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "alpha", nil, "beta"},
+                {ItemAdded, "one", nil, 1},
         })
         // Check local state.
-        c.Assert(node.Map(), Equals, options)
+        c.Assert(node.Map(), DeepEquals, options)
         // Check ZooKeeper state.
         yaml, _, err := s.zkConn.Get(s.path)
         c.Assert(err, IsNil)
         zkData := make(map[string]interface{})
         err = goyaml.Unmarshal([]byte(yaml), zkData)
-        c.Assert(zkData, Equals, options)
+        c.Assert(zkData, DeepEquals, options)
 }
 
 func (s ConfigNodeSuite) TestConflictOnSet(c *C) {
         // Check version conflict errors.
         nodeOne, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         nodeTwo, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
 
         optionsOld := map[string]interface{}{"alpha": "beta", "one": 1}
         nodeOne.Update(optionsOld)
         nodeOne.Write()
 
         nodeTwo.Update(optionsOld)
         changes, err := nodeTwo.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "alpha", nil, "beta"},
-                ItemChange{ItemAdded, "one", nil, 1},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "alpha", nil, "beta"},
+                {ItemAdded, "one", nil, 1},
         })
 
         // First test node one.
-        c.Assert(nodeOne.Map(), Equals, optionsOld)
+        c.Assert(nodeOne.Map(), DeepEquals, optionsOld)
 
         // Write on node one.
         optionsNew := map[string]interface{}{"alpha": "gamma", "one": "two"}
         nodeOne.Update(optionsNew)
         changes, err = nodeOne.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemModified, "alpha", "beta", "gamma"},
-                ItemChange{ItemModified, "one", 1, "two"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemModified, "alpha", "beta", "gamma"},
+                {ItemModified, "one", 1, "two"},
         })
 
         // Verify that node one reports as expected.
-        c.Assert(nodeOne.Map(), Equals, optionsNew)
+        c.Assert(nodeOne.Map(), DeepEquals, optionsNew)
 
         // Verify that node two has still the old data.
-        c.Assert(nodeTwo.Map(), Equals, optionsOld)
+        c.Assert(nodeTwo.Map(), DeepEquals, optionsOld)
 
         // Now issue a Set/Write from node two. This will
         // merge the data deleting 'one' and updating
         // other values.
         optionsMerge := map[string]interface{}{"alpha": "cappa", "new": "next"}
         nodeTwo.Update(optionsMerge)
         nodeTwo.Delete("one")
 
         expected := map[string]interface{}{"alpha": "cappa", "new": "next"}
         changes, err = nodeTwo.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemModified, "alpha", "beta", "cappa"},
-                ItemChange{ItemAdded, "new", nil, "next"},
-                ItemChange{ItemDeleted, "one", 1, nil},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemModified, "alpha", "beta", "cappa"},
+                {ItemAdded, "new", nil, "next"},
+                {ItemDeleted, "one", 1, nil},
         })
-        c.Assert(expected, Equals, nodeTwo.Map())
+        c.Assert(expected, DeepEquals, nodeTwo.Map())
 
         // But node one still reflects the former data.
-        c.Assert(nodeOne.Map(), Equals, optionsNew)
+        c.Assert(nodeOne.Map(), DeepEquals, optionsNew)
 }
 
 func (s ConfigNodeSuite) TestSetItem(c *C) {
         // Check that Set works as expected.
         node, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         options := map[string]interface{}{"alpha": "beta", "one": 1}
         node.Set("alpha", "beta")
         node.Set("one", 1)
         changes, err := node.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "alpha", nil, "beta"},
-                ItemChange{ItemAdded, "one", nil, 1},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "alpha", nil, "beta"},
+                {ItemAdded, "one", nil, 1},
         })
         // Check local state.
-        c.Assert(node.Map(), Equals, options)
+        c.Assert(node.Map(), DeepEquals, options)
         // Check ZooKeeper state.
         yaml, _, err := s.zkConn.Get(s.path)
         c.Assert(err, IsNil)
         zkData := make(map[string]interface{})
         err = goyaml.Unmarshal([]byte(yaml), zkData)
-        c.Assert(zkData, Equals, options)
+        c.Assert(zkData, DeepEquals, options)
 }
 
 func (s ConfigNodeSuite) TestMultipleReads(c *C) {
         // Check that reads without writes always resets the data.
         nodeOne, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         nodeOne.Update(map[string]interface{}{"alpha": "beta", "foo": "bar"})
         value, ok := nodeOne.Get("alpha")
         c.Assert(ok, Equals, true)
         c.Assert(value, Equals, "beta")
         value, ok = nodeOne.Get("foo")
         c.Assert(ok, Equals, true)
         c.Assert(value, Equals, "bar")
         value, ok = nodeOne.Get("baz")
         c.Assert(ok, Equals, false)
 
         // A read resets the data to the empty state.
         err = nodeOne.Read()
         c.Assert(err, IsNil)
-        c.Assert(nodeOne.Map(), Equals, map[string]interface{}{})
+        c.Assert(nodeOne.Map(), DeepEquals, map[string]interface{}{})
         nodeOne.Update(map[string]interface{}{"alpha": "beta", "foo": "bar"})
         changes, err := nodeOne.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "alpha", nil, "beta"},
-                ItemChange{ItemAdded, "foo", nil, "bar"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "alpha", nil, "beta"},
+                {ItemAdded, "foo", nil, "bar"},
         })
 
         // A write retains the newly set values.
         value, ok = nodeOne.Get("alpha")
         c.Assert(ok, Equals, true)
         c.Assert(value, Equals, "beta")
         value, ok = nodeOne.Get("foo")
         c.Assert(ok, Equals, true)
         c.Assert(value, Equals, "bar")
 
         // Now get another state instance and change ZooKeeper state.
         nodeTwo, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         nodeTwo.Update(map[string]interface{}{"foo": "different"})
         changes, err = nodeTwo.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemModified, "foo", "bar", "different"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemModified, "foo", "bar", "different"},
         })
 
         // This should pull in the new state into node one.
         err = nodeOne.Read()
         c.Assert(err, IsNil)
         value, ok = nodeOne.Get("alpha")
         c.Assert(ok, Equals, true)
         c.Assert(value, Equals, "beta")
         value, ok = nodeOne.Get("foo")
         c.Assert(ok, Equals, true)
         c.Assert(value, Equals, "different")
 }
 
 func (s ConfigNodeSuite) TestDeleteEmptiesState(c *C) {
         // Check that delete creates an empty state.
         node, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         node.Set("a", "foo")
         changes, err := node.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "a", nil, "foo"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "a", nil, "foo"},
         })
         node.Delete("a")
         changes, err = node.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemDeleted, "a", "foo", nil},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemDeleted, "a", "foo", nil},
         })
-        c.Assert(node.Map(), Equals, map[string]interface{}{})
+        c.Assert(node.Map(), DeepEquals, map[string]interface{}{})
 }
 
 func (s ConfigNodeSuite) TestReadResync(c *C) {
         // Check that read pulls the data into the node.
         nodeOne, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         nodeOne.Set("a", "foo")
         changes, err := nodeOne.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "a", nil, "foo"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "a", nil, "foo"},
         })
         nodeTwo, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         nodeTwo.Delete("a")
         changes, err = nodeTwo.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemDeleted, "a", "foo", nil},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemDeleted, "a", "foo", nil},
         })
         nodeTwo.Set("a", "bar")
         changes, err = nodeTwo.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "a", nil, "bar"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "a", nil, "bar"},
         })
         // Read of node one should pick up the new value.
         err = nodeOne.Read()
         c.Assert(err, IsNil)
         value, ok := nodeOne.Get("a")
         c.Assert(ok, Equals, true)
         c.Assert(value, Equals, "bar")
 }
 
 func (s ConfigNodeSuite) TestMultipleWrites(c *C) {
         // Check that multiple writes only do the right changes.
         node, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         node.Update(map[string]interface{}{"foo": "bar", "this": "that"})
         changes, err := node.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "foo", nil, "bar"},
-                ItemChange{ItemAdded, "this", nil, "that"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "foo", nil, "bar"},
+                {ItemAdded, "this", nil, "that"},
         })
         node.Delete("this")
         node.Set("another", "value")
         changes, err = node.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "another", nil, "value"},
-                ItemChange{ItemDeleted, "this", "that", nil},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "another", nil, "value"},
+                {ItemDeleted, "this", "that", nil},
         })
 
         expected := map[string]interface{}{"foo": "bar", "another": "value"}
-        c.Assert(expected, Equals, node.Map())
+        c.Assert(expected, DeepEquals, node.Map())
 
         changes, err = node.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{})
+        c.Assert(changes, DeepEquals, []ItemChange{})
 
         err = node.Read()
         c.Assert(err, IsNil)
-        c.Assert(expected, Equals, node.Map())
+        c.Assert(expected, DeepEquals, node.Map())
 
         changes, err = node.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{})
+        c.Assert(changes, DeepEquals, []ItemChange{})
 }
 
 func (s ConfigNodeSuite) TestWriteTwice(c *C) {
         // Check the correct writing into a node by two config nodes.
         nodeOne, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         nodeOne.Set("a", "foo")
         changes, err := nodeOne.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemAdded, "a", nil, "foo"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemAdded, "a", nil, "foo"},
         })
 
         nodeTwo, err := readConfigNode(s.zkConn, s.path)
         c.Assert(err, IsNil)
         nodeTwo.Set("a", "bar")
         changes, err = nodeTwo.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{
-                ItemChange{ItemModified, "a", "foo", "bar"},
+        c.Assert(changes, DeepEquals, []ItemChange{
+                {ItemModified, "a", "foo", "bar"},
         })
 
         // Shouldn't write again. Changes were already
         // flushed and acted upon by other parties.
         changes, err = nodeOne.Write()
         c.Assert(err, IsNil)
-        c.Assert(changes, Equals, []ItemChange{})
+        c.Assert(changes, DeepEquals, []ItemChange{})
 
         err = nodeOne.Read()
         c.Assert(err, IsNil)
-        c.Assert(nodeOne, Equals, nodeTwo)
+        c.Assert(nodeOne, DeepEquals, nodeTwo)
 }
+
+type QuoteSuite struct{}
+
+var _ = Suite(&QuoteSuite{})
+
+func (s QuoteSuite) TestUnmodified(c *C) {
+        // Check that a string containig only valid
+        // chars stays unmodified.
+        in := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
+        out := Quote(in)
+        c.Assert(out, Equals, in)
+}
+
+func (s QuoteSuite) TestQuote(c *C) {
+        // Check that invalid chars are translated correctly.
+        in := "hello_there/how'are~you-today.sir"
+        out := Quote(in)
+        c.Assert(out, Equals, "hello_5f_there_2f_how_27_are_7e_you-today.sir")
+}