← Back to branch summary

~bjornt/pyjuju/stack-crack

« back to all changes in this revision

Viewing changes to ensemble/providers/orchestra/tests/test_bootstrap.py

  • Committer: William Reade
  • Date: 2011-08-17 09:17:06 UTC
  • mfrom: (306.1.24 hide-instances)
  • Revision ID: fwereade@gmail.com-20110817091706-2zg0we3co9xqrwfk
simplified instance-getting; ec2 no longer filters 'pending' instances, to better match orchestra behaviour; several error types/messages reworked

Show diffs side-by-side

added added

removed removed

Lines of Context:
ensemble/providers/orchestra/tests/test_bootstrap.py
6
6
from ensemble.errors import ProviderError
7
7
from ensemble.lib.testing import TestCase
8
8
from ensemble.providers.orchestra.machine import OrchestraMachine
9
 
from ensemble.providers.orchestra.tests.common import (
10
 
    OrchestraMachineLaunchMixin)
11
 
 
12
 
 
13
 
class OrchestraBootstrapTest(TestCase, OrchestraMachineLaunchMixin):
 
9
from ensemble.providers.orchestra.tests.common import OrchestraTestMixin
 
10
 
 
11
 
 
12
class OrchestraBootstrapTest(TestCase, OrchestraTestMixin):
14
13
 
15
14
    def mock_verify(self):
16
15
        self.getPage("http://somewhe.re/webdav/bootstrap-verify",
25
24
 
26
25
    def test_already_bootstrapped(self):
27
26
        self.setup_mocks()
28
 
        self.mock_find_zookeepers("winston-uid")
 
27
        self.mock_find_zookeepers(("winston-uid", "winston"))
29
28
        self.mocker.replay()
30
29
 
31
30
        def verify_machines(machines):