On Mon, Nov 17, 2014 at 11:29 AM, 'Aaron Karper' via ganeti-devel <[email protected]> wrote: > A test console is created with _Test. This patch renames it to > MakeConsole. > > Signed-off-by: Aaron Karper <[email protected]> > --- > test/py/ganeti.hypervisor.hv_kvm_unittest.py | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/test/py/ganeti.hypervisor.hv_kvm_unittest.py > b/test/py/ganeti.hypervisor.hv_kvm_unittest.py > index c2145bd..a99157b 100755 > --- a/test/py/ganeti.hypervisor.hv_kvm_unittest.py > +++ b/test/py/ganeti.hypervisor.hv_kvm_unittest.py > @@ -244,7 +244,7 @@ class TestQmp(testutils.GanetiTestCase): > > > class TestConsole(unittest.TestCase): > - def _Test(self, instance, node, group, hvparams): > + def MakeConsole(self, instance, node, group, hvparams): > cons = hv_kvm.KVMHypervisor.GetInstanceConsole(instance, node, group, > hvparams, {}) > self.assertEqual(cons.Validate(), None) > @@ -261,7 +261,7 @@ class TestConsole(unittest.TestCase): > constants.HV_VNC_BIND_ADDRESS: None, > constants.HV_KVM_SPICE_BIND: None, > } > - cons = self._Test(instance, node, group, hvparams) > + cons = self.MakeConsole(instance, node, group, hvparams) > self.assertEqual(cons.kind, constants.CONS_SSH) > self.assertEqual(cons.host, node.name) > self.assertEqual(cons.command[0], pathutils.KVM_CONSOLE_WRAPPER) > @@ -279,7 +279,7 @@ class TestConsole(unittest.TestCase): > constants.HV_VNC_BIND_ADDRESS: "192.0.2.1", > constants.HV_KVM_SPICE_BIND: None, > } > - cons = self._Test(instance, node, group, hvparams) > + cons = self.MakeConsole(instance, node, group, hvparams) > self.assertEqual(cons.kind, constants.CONS_VNC) > self.assertEqual(cons.host, "192.0.2.1") > self.assertEqual(cons.port, constants.VNC_BASE_PORT + 10) > @@ -297,7 +297,7 @@ class TestConsole(unittest.TestCase): > constants.HV_VNC_BIND_ADDRESS: None, > constants.HV_KVM_SPICE_BIND: "192.0.2.1", > } > - cons = self._Test(instance, node, group, hvparams) > + cons = self.MakeConsole(instance, node, group, hvparams) > self.assertEqual(cons.kind, constants.CONS_SPICE) > self.assertEqual(cons.host, "192.0.2.1") > self.assertEqual(cons.port, 11000) > @@ -314,7 +314,7 @@ class TestConsole(unittest.TestCase): > constants.HV_VNC_BIND_ADDRESS: None, > constants.HV_KVM_SPICE_BIND: None, > } > - cons = self._Test(instance, node, group, hvparams) > + cons = self.MakeConsole(instance, node, group, hvparams) > self.assertEqual(cons.kind, constants.CONS_MESSAGE) > > > -- > 2.1.0.rc2.206.gedb03e5 >
LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
