← Back to branch summary

~matsubara/maas/remove-network-config-hack

« back to all changes in this revision

Viewing changes to maas-integration.py

  • Committer: Tarmac
  • Author(s): Diogo Matsubara
  • Date: 2013-02-27 14:40:39 UTC
  • mfrom: (203.1.1 fix-tags-tests-order)
  • Revision ID: tarmac-20130227144039-h9z0rxbie1lc10ds
[r=matsubara][bug=][author=matsubara] Fix naming for the tags tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
maas-integration.py
183
183
    "test_set_nodes_ipmi_config",
184
184
    "test_commission_nodes",
185
185
    "test_check_nodes_ready",
 
186
    "test_apply_tag_to_all_nodes",
 
187
    "test_check_tag_applied_to_all_nodes",
186
188
    "test_juju_bootstrap",
187
189
    "test_juju_setup",
188
190
    "test_juju_deploy_mediawiki",
493
495
    def test_check_nodes_ready(self):
494
496
        self._wait_nodes(4)
495
497
 
496
 
    def test_16A_apply_tag_to_all_nodes(self):
 
498
    def test_apply_tag_to_all_nodes(self):
497
499
        # Use maas-cli to set a tag on all nodes.
498
500
        output, err = self._run_maas_cli(["tags", "new", "name=all",
499
501
            "definition=true()", "comment=A tag present on all nodes"])
501
503
        self.assertEqual(tag['name'], "all")
502
504
 
503
505
    @timeout(10*60)
504
 
    def test_16B_check_tag_applied_to_all_nodes(self):
 
506
    def test_check_tag_applied_to_all_nodes(self):
505
507
        # Wait for all nodes to have new tag applied.
506
508
        expected_node_count = self.get_node_count()
507
509
        while True: