← Back to branch summary

~therve/pyjuju/validate-config-values

« back to all changes in this revision

Viewing changes to juju/state/tests/test_relation.py

  • Committer: kapil.thangavelu at canonical
  • Date: 2012-04-12 18:39:20 UTC
  • mfrom: (509.1.4 managed-zk-client)
  • Revision ID: kapil.thangavelu@canonical.com-20120412183920-jjrhrpibxzkexk1v
merge managed-zk-client, also fix trunk test, and disable topo migration [r=fwereade]

 juju now uses the txzookeeper.managed Client which automatically restablishes 
 sessions recreating presence nodes and triggering extant watches.

 This also fixes some subordinte changes, namely a broken lxc test, and disables the 
 transparent topology migration as without accompanying code changes to running agents
 it will cause problems.

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/state/tests/test_relation.py
8
8
 
9
9
from twisted.internet.defer import (
10
10
    inlineCallbacks, returnValue, Deferred, fail, succeed)
11
 
from txzookeeper import ZookeeperClient
12
11
 
13
12
from juju.charm.directory import CharmDirectory
14
13
from juju.charm.tests import local_charm_id
855
854
 
856
855
        # manually construct a unit relation state using a separate
857
856
        # connection.
858
 
        client2 = ZookeeperClient(self.client.servers)
 
857
        client2 = self.get_zookeeper_client()
859
858
        yield client2.connect()
860
859
        service_relation = ServiceRelationState(
861
860
            client2,