Merge lp:~gz/juju-ci-tools/tweak_test_networking into lp:juju-ci-tools

[Martin Packman]

Tweak how test_private_address uses mock side_effect

This avoids a failure I see with older mock versions:

======================================================================
ERROR: test_private_address (test_assess_container_networking.TestContainerNetworking)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/juju-ci-tools/tests/test_assess_container_networking.py", line 351, in test_private_address
    result = jcnet.private_address(fake_client, "machine.test")
  File "assess_container_networking.py", line 256, in private_address
    default_route = ssh(client, host, 'ip -4 -o route list 0/0')
  File "<string>", line 3, in ssh
  File "/usr/lib/python2.7/dist-packages/mock.py", line 964, in __call__
    return _mock_self._mock_call(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1022, in _mock_call
    result = next(effect)
TypeError: list object is not an iterator

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'tests/test_assess_container_networking.py'
--- tests/test_assess_container_networking.py	2016-08-03 21:17:26 +0000
+++ tests/test_assess_container_networking.py	2016-08-11 20:49:16 +0000
@@ -340,14 +340,13 @@
             jcnet.assess_internet_connection, self.client, targets)
 
     def test_private_address(self):
-        side_effect = ["default via 10.0.30.1 dev br-eth1",
+        ssh_results = ["default via 10.0.30.1 dev br-eth1",
                        "5: br-eth1    inet 10.0.30.24/24 brd "
                        "10.0.30.255 scope global br-eth1    "
                        "valid_lft forever preferred_lft forever"]
+        fake_client = object()
         with patch("assess_container_networking.ssh",
-                   autospec=True) as mock_ssh:
-            mock_ssh.side_effect = side_effect
-            fake_client = object()
+                   autospec=True, side_effect=ssh_results) as mock_ssh:
             result = jcnet.private_address(fake_client, "machine.test")
         self.assertEqual(result, "10.0.30.24")
         self.assertEqual(mock_ssh.mock_calls,