← Back to branch summary

~hazmat/pyjuju/status-w-peers

« back to all changes in this revision

Viewing changes to ensemble/agents/tests/test_provision.py

  • Committer: Jim Baker
  • Date: 2011-06-27 16:10:19 UTC
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: jim.baker@canonical.com-20110627161019-apys1261x2phtqb4
Cleanup - PEP8, PyFlakes, removed debugging

Show diffs side-by-side

added added

removed removed

Lines of Context:
ensemble/agents/tests/test_provision.py
24
24
MATCH_MACHINE = MATCH(lambda x: isinstance(x, DummyMachine))
25
25
 
26
26
 
27
 
log = logging.getLogger("ensemble.agents.provision") # XXX
28
 
 
29
 
 
30
27
class ProvisioningTestBase(AgentTestBase):
31
28
 
32
29
    agent_class = ProvisioningAgent
418
415
                                           logging.DEBUG)
419
416
 
420
417
    @inlineCallbacks
421
 
    def tearDown(self):
422
 
        print "\nlog\n", self.output.getvalue()
423
 
        yield super(ExposeTest, self).tearDown()
424
 
 
425
 
    @inlineCallbacks
426
418
    def start_agent_with_watch_support(self):
427
419
        mock_reactor = self.mocker.patch(reactor)
428
420
        mock_reactor.callLater(
449
441
                # using tests because of background activity
450
442
                if not condition_met.called:
451
443
                    condition_met.callback(True)
452
 
            log.debug("%s (seen=%s, expected=%s)", unit_name, seen, expected) # XXX
453
444
            return succeed(True)
454
445
 
455
446
        self.agent.set_open_close_ports_observer(observer)
469
460
        expected_units = self.wait_on_expected_units(
470
461
            set(["wordpress/0"]))
471
462
        wordpress = yield self.add_service("wordpress")
472
 
        wordpress_0 = yield wordpress.add_unit_state()
 
463
        yield wordpress.add_unit_state()
473
464
        yield wordpress.set_exposed_flag()
474
465
        self.assertTrue((yield expected_units))
475
466
 
494
485
        expected_units = self.wait_on_expected_units(
495
486
            set(["wordpress/0", "wordpress/1"]))
496
487
        wordpress_0 = yield wordpress.add_unit_state()
497
 
        wordpress_1 = yield wordpress.add_unit_state()
 
488
        yield wordpress.add_unit_state()
498
489
        self.assertTrue((yield expected_units))
499
490
 
500
491
        # Removing service units will also trigger
501
492
        expected_units = self.wait_on_expected_units(
502
493
            set(["wordpress/0", "wordpress/2"]))
503
494
        yield wordpress.remove_unit_state(wordpress_0)
504
 
        wordpress_2 = yield wordpress.add_unit_state()
 
495
        yield wordpress.add_unit_state()
505
496
        self.assertTrue((yield expected_units))
506
497
        yield self.agent.stop()
507
498
 
517
508
        yield wordpress.set_exposed_flag()
518
509
        wordpress_0 = yield wordpress.add_unit_state()
519
510
        wordpress_1 = yield wordpress.add_unit_state()
520
 
        wordpress_2 = yield wordpress.add_unit_state()
 
511
        yield wordpress.add_unit_state()
521
512
        yield wordpress_0.open_port(443, "tcp")
522
513
        yield wordpress_0.open_port(80, "tcp")
523
514
        yield wordpress_0.close_port(443, "tcp")
545
536
        expected_units = self.wait_on_expected_units(
546
537
            set(["wordpress/0", "wordpress/1"]))
547
538
        wordpress = yield self.add_service("wordpress")
548
 
        wordpress_0 = yield wordpress.add_unit_state()
549
 
        wordpress_1 = yield wordpress.add_unit_state()
 
539
        yield wordpress.add_unit_state()
 
540
        yield wordpress.add_unit_state()
550
541
        yield wordpress.set_exposed_flag()
551
542
        self.assertTrue((yield expected_units))
552
543