On 12/04/2014 05:20 PM, 'Klaus Aehlig' via ganeti-devel wrote:
....which is a semantic conflict of the merge.
Signed-off-by: Klaus Aehlig <[email protected]>
---
test/py/ganeti.hypervisor.hv_kvm_unittest.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/py/ganeti.hypervisor.hv_kvm_unittest.py
b/test/py/ganeti.hypervisor.hv_kvm_unittest.py
index 90c008c..4f0fbf6 100755
--- a/test/py/ganeti.hypervisor.hv_kvm_unittest.py
+++ b/test/py/ganeti.hypervisor.hv_kvm_unittest.py
@@ -526,7 +526,7 @@ class TestKvmRuntime(testutils.GanetiTestCase):
self.MockOut('write_file', mock.patch('ganeti.utils.WriteFile'))
self.MockOut(mock.patch(kvm_class + '.ValidateParameters'))
self.MockOut(mock.patch('ganeti.hypervisor.hv_kvm.OpenTap',
- return_value=('test_nic', [])))
+ return_value=('test_nic', [], [])))
self.MockOut(mock.patch(kvm_class + '._ConfigureNIC'))
self.MockOut('pid_alive', mock.patch(kvm_class + '._InstancePidAlive',
return_value=('file', -1, False)))
LGTM
--
Niklas Hambüchen
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
