← Back to branch summary

~abentley/juju-ci-tools/client-from-config-4

« back to all changes in this revision

Viewing changes to tests/test_jujuci.py

  • Committer: Curtis Hovey
  • Date: 2015-12-20 15:14:05 UTC
  • Revision ID: curtis@canonical.com-20151220151405-pm3dauunjr2978gz
skip any client-server that starts with 1.26.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_jujuci.py
642
642
        config = {'environments': {'local': {'type': 'local'}}}
643
643
        with jujupy._temp_env(config, set_home=True):
644
644
            with patch('jujuci.destroy_environment', autospec=True) as mock_de:
645
 
                with patch.object(jujupy.EnvJujuClient, 'get_version'):
646
 
                    with patch('jujupy.get_client_class') as gcc_mock:
647
 
                        gcc_mock.return_value = jujupy.EnvJujuClient
648
 
                        dirty = clean_environment('foo', verbose=False)
 
645
                with patch('jujupy.EnvJujuClient.by_version', side_effect=(
 
646
                        lambda env: jujupy.EnvJujuClient(env, '1', None))):
 
647
                    dirty = clean_environment('foo', verbose=False)
649
648
        self.assertFalse(dirty)
650
649
        self.assertEqual(0, mock_de.call_count)
651
650
 
653
652
        config = {'environments': {'foo': {'type': 'local'}}}
654
653
        with jujupy._temp_env(config, set_home=True):
655
654
            with patch('jujuci.destroy_environment', autospec=True) as mock_de:
656
 
                with patch.object(jujupy.EnvJujuClient, 'get_version'):
657
 
                    with patch('jujupy.get_client_class') as gcc_mock:
658
 
                        factory = gcc_mock.return_value
659
 
                        factory.return_value = jujupy.EnvJujuClient(
660
 
                            None, None, None)
661
 
                        with patch.object(jujupy.EnvJujuClient,
662
 
                                          'get_full_path'):
663
 
                            with patch.object(jujupy.JujuData, 'load_yaml'):
664
 
                                dirty = clean_environment('foo', verbose=False)
 
655
                with patch('jujupy.EnvJujuClient.by_version', side_effect=(
 
656
                        lambda env: jujupy.EnvJujuClient(env, '1', None))):
 
657
                    dirty = clean_environment('foo', verbose=False)
665
658
        self.assertTrue(dirty)
666
659
        self.assertEqual(1, mock_de.call_count)
667
660
        args, kwargs = mock_de.call_args