← Back to branch summary

~matsubara/maas/ipmi-debug

« back to all changes in this revision

Viewing changes to maas-integration.py

  • Committer: Diogo Matsubara
  • Date: 2013-12-13 12:47:38 UTC
  • mto: This revision was merged to the branch mainline in revision 228.
  • Revision ID: diogo.matsubara@canonical.com-20131213124738-35hcap78m3f1276a
enable arm preseed update test and remove ipmi debugging patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
maas-integration.py
199
199
    "test_check_initial_services",
200
200
    "test_update_pxe_config",
201
201
    "test_import_pxe_files",
202
 
#    "test_update_preseed_arm",
 
202
    "test_update_preseed_arm",
203
203
    "test_login_api",
204
204
    "test_set_http_proxy",
205
205
    "test_cluster_connected",
311
311
        expected_output = 'Downloading to temporary location'
312
312
        assertCommandReturnCode(self, cmd, expected_output, env=env)
313
313
 
314
 
#    def test_update_preseed_arm(self):
315
 
#        #XXX: matsubara add workaround to boot arm nodes.
316
 
#        try:
317
 
#            # Try the old location first, the one used before the templates
318
 
#            # were moved to /etc/maas/.
319
 
#            userdata_fd = open("/usr/share/maas/preseeds/enlist_userdata", "rb+")
320
 
#        except IOError:
321
 
#            userdata_fd = open("/etc/maas/preseeds/enlist_userdata", "rb+")
322
 
#        userdata = userdata_fd.read()
323
 
#        userdata += '\napt_sources:\n - source: "deb http://ports.ubuntu.com/ubuntu-ports precise-proposed main"'
324
 
#        userdata_fd.seek(0)
325
 
#        userdata_fd.write(userdata)
326
 
#        userdata_fd.close()
 
314
    def test_update_preseed_arm(self):
 
315
        #XXX: matsubara add workaround to boot arm nodes.
 
316
        try:
 
317
            # Try the old location first, the one used before the templates
 
318
            # were moved to /etc/maas/.
 
319
            userdata_fd = open("/usr/share/maas/preseeds/enlist_userdata", "rb+")
 
320
        except IOError:
 
321
            userdata_fd = open("/etc/maas/preseeds/enlist_userdata", "rb+")
 
322
        userdata = userdata_fd.read()
 
323
        userdata += '\napt_sources:\n - source: "deb http://ports.ubuntu.com/ubuntu-ports precise-proposed main"'
 
324
        userdata_fd.seek(0)
 
325
        userdata_fd.write(userdata)
 
326
        userdata_fd.close()
327
327
 
328
328
    def test_login_api(self):
329
329
        token_str = get_token_str()