From 209651ef3809846328ee236321400c656a3a1a85 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 30 Nov 2014 14:09:21 +0100 Subject: [PATCH] Dry run working in tests --- bootstrapvz/base/remote/remote.py | 2 -- tests/integration/tools/__init__.py | 5 +++++ tests/integration/tools/build_servers.py | 2 +- tests/integration/virtualbox_tests.py | 12 +++++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/bootstrapvz/base/remote/remote.py b/bootstrapvz/base/remote/remote.py index aeffa31..6dc9a37 100644 --- a/bootstrapvz/base/remote/remote.py +++ b/bootstrapvz/base/remote/remote.py @@ -4,8 +4,6 @@ def main(): """Main function for invoking the bootstrap process remotely - - """ # Get the commandline arguments opts = get_opts() diff --git a/tests/integration/tools/__init__.py b/tests/integration/tools/__init__.py index dbe0446..2ca8b8c 100644 --- a/tests/integration/tools/__init__.py +++ b/tests/integration/tools/__init__.py @@ -2,6 +2,11 @@ from bootstrapvz.common.tools import load_data from build_servers import LocalBuildServer from build_servers import RemoteBuildServer +# Register deserialization handlers for objects +# that will pass between server and client +from bootstrapvz.base.remote import register_deserialization_handlers +register_deserialization_handlers() + # Snatched from here: http://stackoverflow.com/a/7205107 def merge_dicts(*args): diff --git a/tests/integration/tools/build_servers.py b/tests/integration/tools/build_servers.py index c103624..95daf41 100644 --- a/tests/integration/tools/build_servers.py +++ b/tests/integration/tools/build_servers.py @@ -5,7 +5,7 @@ class BuildServer(object): def __init__(self, settings): self.settings = settings - self.build_settings = settings.get('build_settings', None) + self.build_settings = settings.get('build_settings', {}) self.can_bootstrap = settings['can_bootstrap'] self.release = settings.get('release', None) diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py index 21bc847..ea7eaed 100644 --- a/tests/integration/virtualbox_tests.py +++ b/tests/integration/virtualbox_tests.py @@ -1,10 +1,11 @@ import tools from manifests import partials +from bootstrapvz.base.manifest import Manifest def test_virtualbox_unpartitioned_extlinux(): import yaml - specific_settings = yaml.load(""" + manifest_data = yaml.load(""" provider: name: virtualbox system: @@ -14,11 +15,12 @@ volume: partitions: type: msdos """) - manifest = tools.merge_dicts(partials['base'], partials['stable64'], - partials['unpartitioned'], specific_settings) + manifest_data = tools.merge_dicts(partials['base'], partials['stable64'], + partials['unpartitioned'], manifest_data) - build_server = tools.pick_build_server(manifest) - manifest['provider']['guest_additions'] = build_server.build_settings['guest_additions'] + build_server = tools.pick_build_server(manifest_data) + manifest_data['provider']['guest_additions'] = build_server.build_settings['guest_additions'] + manifest = Manifest(data=manifest_data) bootstrap_info = tools.bootstrap(manifest, build_server)