diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2010-07-25 15:11:20 +0100 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2010-07-25 15:11:20 +0100 |
| commit | 605bfc4990a67aae4a644f961cd881461d09cf2f (patch) | |
| tree | f0b3cab1ef15789ee1c06ef8d5c5cedff8196a71 /nova/tests | |
| parent | b2d769cb92dce5be26288c8e389491cf554b5703 (diff) | |
| parent | 1a53eaeed901f3c789ebdb867b73996ccac608c3 (diff) | |
Merge ~ewanmellor/nova/lp609749.
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/network_unittest.py | 2 | ||||
| -rw-r--r-- | nova/tests/process_unittest.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index 98568aeae..69278e896 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -137,7 +137,7 @@ class NetworkTestCase(test.TrialTestCase): self.dnsmasq.release_ip(mac3, address3, hostname, net.bridge_name) net = network.get_project_network("project0", "default") rv = network.deallocate_ip(secondaddress) - self.dnsmasq.release_ip(mac, address, hostname, net.bridge_name) + self.dnsmasq.release_ip(mac, secondaddress, hostname, net.bridge_name) def test_release_before_deallocate(self): pass diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py index 1c15b69a0..c96bb5913 100644 --- a/nova/tests/process_unittest.py +++ b/nova/tests/process_unittest.py @@ -120,3 +120,10 @@ class ProcessTestCase(test.TrialTestCase): pool2 = process.SharedPool() self.assert_(id(pool1) == id(pool2)) + def test_shared_pool_works_as_singleton(self): + d1 = process.simple_execute('sleep 1') + d2 = process.simple_execute('sleep 0.005') + # lp609749: would have failed with + # exceptions.AssertionError: Someone released me too many times: + # too many tokens! + return d1 |