← Back to branch summary

~frankban/charms/precise/juju-gui/deployer-unit-errors

« back to all changes in this revision

Viewing changes to server/guiserver/tests/bundles/test_base.py

  • Committer: Francesco Banconi
  • Date: 2014-02-20 13:08:59 UTC
  • mfrom: (164.1.3 deployer-unit-errors-proto)
  • Revision ID: francesco.banconi@canonical.com-20140220130859-qtf8bf0jkc1w68hx
New deployer v0.3.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/guiserver/tests/bundles/test_base.py
138
138
        self.wait()
139
139
        mock_import_bundle.assert_called_once_with(
140
140
            self.apiurl, self.user.password, 'bundle', self.bundle,
141
 
            base.IMPORTER_OPTIONS)
 
141
            deployer.importer_options)
142
142
        mock_import_bundle.assert_called_in_a_separate_process()
143
143
 
144
144
    def test_options_are_fully_populated(self):
145
145
        # The options passed to the deployer match what it expects and are not
146
146
        # missing any entries.
 
147
        deployer = self.make_deployer()
147
148
        default_options = deployer_cli.setup_parser().parse_args([]).__dict__
148
 
        expected_options = sorted(default_options.keys())
149
 
        passed_options = sorted(base.IMPORTER_OPTIONS.__dict__.keys())
 
149
        expected_options = set(default_options.keys())
 
150
        passed_options = set(deployer.importer_options.__dict__.keys())
150
151
        self.assertEqual(expected_options, passed_options)
151
152
 
152
153
    def test_watch(self):