Reminder: commit message requires a description. On Mon, Nov 11, 2013 at 4:37 PM, Petr Pudlak <[email protected]> wrote:
> Signed-off-by: Petr Pudlak <[email protected]> > --- > test/py/ganeti.backend_unittest.py | 6 ++++-- > test/py/ganeti.config_unittest.py | 7 +++++-- > test/py/ganeti.objects_unittest.py | 4 ++++ > 3 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/test/py/ganeti.backend_unittest.py b/test/py/ > ganeti.backend_unittest.py > index a590170..9590c1a 100755 > --- a/test/py/ganeti.backend_unittest.py > +++ b/test/py/ganeti.backend_unittest.py > @@ -89,7 +89,8 @@ class TestNodeVerify(testutils.GanetiTestCase): > # this a real functional test, but requires localhost to be reachable > local_data = (netutils.Hostname.GetSysName(), > constants.IP4_ADDRESS_LOCALHOST) > - result = backend.VerifyNode({constants.NV_MASTERIP: local_data}, > None, {}, {}, {}) > + result = backend.VerifyNode({constants.NV_MASTERIP: local_data}, > + None, {}, {}, {}) > self.failUnless(constants.NV_MASTERIP in result, > "Master IP data not returned") > self.failUnless(result[constants.NV_MASTERIP], "Cannot reach > localhost") > @@ -100,7 +101,8 @@ class TestNodeVerify(testutils.GanetiTestCase): > bad_data = ("master.example.com", "192.0.2.1") > # we just test that whatever TcpPing returns, VerifyNode returns too > netutils.TcpPing = lambda a, b, source=None: False > - result = backend.VerifyNode({constants.NV_MASTERIP: bad_data}, None, > {}, {}, {}) > + result = backend.VerifyNode({constants.NV_MASTERIP: bad_data}, > + None, {}, {}, {}) > self.failUnless(constants.NV_MASTERIP in result, > "Master IP data not returned") > self.failIf(result[constants.NV_MASTERIP], > These lint-breaking changes were introduced in the previous patch, right? This usually means that they have to be fixed there as well, if for no other reason, then not to overshadow other errors. E.g. pylint errors prevent haskell lint from being run with the make lint invocation, and you could overlook some issues. If it is not too much work, move this to the previous patch. I know it is a pain, but others made me do it as well ;) Hrvoje Ribicic Ganeti Engineering 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 Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
