← Back to branch summary

~hopem/charm-helpers/fix-lp1425999

« back to all changes in this revision

Viewing changes to tests/contrib/database/test_mysql.py

  • Committer: Edward Hope-Morley
  • Date: 2015-02-27 10:02:42 UTC
  • Revision ID: edward.hope-morley@canonical.com-20150227100242-kbxfmiscxdg2mlez
switch to ip.get_host_ip()

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/contrib/database/test_mysql.py
59
59
        helper.grant_exists.assert_has_calls(calls)
60
60
        self.assertEqual(units, set(['unit/0', 'unit/1', 'unit/2']))
61
61
 
62
 
    @mock.patch.object(mysql, 'socket')
 
62
    @mock.patch('charmhelpers.contrib.network.ip.socket')
63
63
    @mock.patch.object(mysql, 'unit_get')
64
64
    @mock.patch.object(mysql, 'config_get')
65
65
    @mock.patch.object(mysql, 'log')
74
74
        mock_unit_get.return_value = '10.0.0.1'
75
75
        out = helper.normalize_address('10.0.0.1')
76
76
        self.assertEqual('127.0.0.1', out)
 
77
        mock_config_get.assert_called_with('prefer-ipv6')
77
78
 
78
79
        mock_unit_get.return_value = '10.0.0.1'
79
80
        out = helper.normalize_address('10.0.0.2')
80
81
        self.assertEqual('10.0.0.2', out)
 
82
        mock_config_get.assert_called_with('prefer-ipv6')
 
83
 
 
84
        out = helper.normalize_address('2001:db8:1::1')
 
85
        self.assertEqual('2001:db8:1::1', out)
 
86
        mock_config_get.assert_called_with('prefer-ipv6')
81
87
 
82
88
        mock_socket.gethostbyname.side_effect = Exception
83
89
        out = helper.normalize_address('unresolvable')
84
90
        self.assertEqual('unresolvable', out)
 
91
        mock_config_get.assert_called_with('prefer-ipv6')
 
92
 
 
93
        # prefer-ipv6
 
94
        mock_config_get.return_value = True
 
95
        mock_socket.gethostbyname.side_effect = 'other'
 
96
        out = helper.normalize_address('unresolvable')
 
97
        self.assertEqual('unresolvable', out)
 
98
        mock_config_get.assert_called_with('prefer-ipv6')
85
99
 
86
100
 
87
101
class PerconaTests(unittest.TestCase):