← Back to branch summary

~hazmat/pyjuju/proposed-support

« back to all changes in this revision

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

  • Committer: kapil.thangavelu at canonical
  • Date: 2012-05-22 22:08:15 UTC
  • mfrom: (484.1.53 trunk)
  • Revision ID: kapil.thangavelu@canonical.com-20120522220815-acyt8m89i9ybe0w1
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/state/tests/common.py
2
2
 
3
3
import zookeeper
4
4
 
5
 
from txzookeeper import ZookeeperClient
6
5
from txzookeeper.tests.utils import deleteTree
7
6
 
8
 
from juju.lib.testing import TestCase
 
7
from juju.charm.directory import CharmDirectory
9
8
from juju.charm.tests.test_directory import sample_directory
10
 
from juju.charm.directory import CharmDirectory
 
9
from juju.environment.tests.test_config import EnvironmentsConfigTestBase
11
10
from juju.state.topology import InternalTopology
12
 
from juju.tests.common import get_test_zookeeper_address
13
 
 
14
 
 
15
 
class StateTestBase(TestCase):
 
11
 
 
12
 
 
13
class StateTestBase(EnvironmentsConfigTestBase):
16
14
 
17
15
    @inlineCallbacks
18
16
    def setUp(self):
33
31
        # Close and reopen connection, so that watches set during
34
32
        # testing are not affected by the cleaning up.
35
33
        self.client.close()
36
 
        client = ZookeeperClient(get_test_zookeeper_address())
 
34
        client = self.get_zookeeper_client()
37
35
        yield client.connect()
38
36
        deleteTree(handle=client.handle)
39
37
        client.close()