← Back to branch summary

~matsubara/maas/precise-tests

« back to all changes in this revision

Viewing changes to cluster-controller-integration.py

  • Committer: Diogo Matsubara
  • Date: 2014-02-27 19:35:59 UTC
  • mto: This revision was merged to the branch mainline in revision 236.
  • Revision ID: diogo.matsubara@canonical.com-20140227193559-oxqbocu4vav8qhjo
remove update_pxe_config since it's not doing anything anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
cluster-controller-integration.py
5
5
import zmq
6
6
 
7
7
from utils import (
8
 
    assertCommandReturnCode, run_command, update_pxe_config,
9
 
    CLUSTER_CONTROLLER_IP
 
8
    assertCommandReturnCode, run_command, CLUSTER_CONTROLLER_IP
10
9
    )
11
10
 
12
11
 
13
12
tests_order = [
14
13
    'test_preseed_updated_cluster_config',
15
 
    'test_update_pxe_config',
16
14
    'test_import_pxe_files',
17
15
    'test_wait_for_region_controller',
18
16
]
34
32
        self.assertThat(maas_file, Contains(
35
33
            'MAAS_URL="http://192.168.21.5/MAAS"'))
36
34
 
37
 
    def test_update_pxe_config(self):
38
 
        update_pxe_config()
39
 
 
40
35
    def test_import_pxe_files(self):
41
36
        cmd = ['maas-import-pxe-files']
42
37
        expected_output = 'Downloading to temporary location'