← Back to branch summary

~blake-rouse/maas/osystem-preseed-cleanup

~blake-rouse/maas/osystem-preseed-cleanup

« back to all changes in this revision

Viewing changes to src/provisioningserver/boot/tests/test_tftppath.py

Committer: Blake Rouse
Date: 2014-05-02 15:32:18 UTC
mfrom: (2290.1.7 3_add-osystem-to-node)
Revision ID: blake.rouse@canonical.com-20140502153218-940upl3bp5lsh50f

Merge add-osystem-to-node.

files added:
scripts/uec2roottar

src/maasserver/migrations/0075_add_boot_resource_models.py

src/maasserver/models/bootsource.py

src/maasserver/models/tests/test_bootsource.py

src/provisioningserver/import_images/download_resources.py

src/provisioningserver/import_images/tests/test_uec2roottar.py

src/provisioningserver/import_images/uec2roottar.py

files removed:
scripts/uec2roottar

files renamed:
src/maasserver/migrations/0075_add_osystem_to_bootimage.py => src/maasserver/migrations/0076_add_osystem_to_bootimage.py

src/maasserver/migrations/0076_add_osystem_to_node.py => src/maasserver/migrations/0077_add_osystem_to_node.py

files modified:
HACKING.txt

LICENSE

Makefile

docs/man/maas-region-admin.8.rst

man/maas-region-admin.8

src/apiclient/maas_client.py

src/apiclient/tests/test_maas_client.py

src/maasserver/api.py

src/maasserver/apidoc.py

src/maasserver/models/__init__.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/registration/login.html

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_apidoc.py

src/provisioningserver/auth.py

src/provisioningserver/boot/tests/test_tftppath.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/product_mapping.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/import_images/tests/test_product_mapping.py

src/provisioningserver/power_schema.py

src/provisioningserver/tasks.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/tests/test_upgrade_cluster.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

src/provisioningserver/boot/tests/test_tftppath.py

106

106

107

107

def reset_func(obj, old_func):

108

108

obj.get_boot_image_purposes = old_func

109

109

110

testcase.addCleanup(reset_func, obj, old_func)

111

110

112

return obj

111

113

112

114

Older »