LGTM, but please remove the doclint comment as well. Thanks! On Wed, May 27, 2015 at 6:37 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> Avoiding lint errors on the onehand, and code complexity > on the other. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > qa/qa_cluster.py | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py > index 3d8b61c..b23a593 100644 > --- a/qa/qa_cluster.py > +++ b/qa/qa_cluster.py > @@ -1150,7 +1150,7 @@ def TestClusterVersion(): > AssertCommand(["gnt-cluster", "version"]) > > > -def _AssertSsconfCertFiles(master): > +def _AssertSsconfCertFiles(): > """This asserts that all ssconf_master_candidate_certs have the same > content. > > @type master: string > @@ -1240,25 +1240,25 @@ def TestClusterRenewCrypto(): > "--new-cluster-certificate", "--new-confd-hmac-key", > "--new-rapi-certificate", > "--new-cluster-domain-secret", > "--new-node-certificates"]) > - _AssertSsconfCertFiles(master) > + _AssertSsconfCertFiles() > AssertCommand(["gnt-cluster", "verify"]) > > # Only renew node certificates > AssertCommand(["gnt-cluster", "renew-crypto", "--force", > "--new-node-certificates"]) > - _AssertSsconfCertFiles(master) > + _AssertSsconfCertFiles() > AssertCommand(["gnt-cluster", "verify"]) > > # Only renew cluster certificate > AssertCommand(["gnt-cluster", "renew-crypto", "--force", > "--new-cluster-certificate"]) > - _AssertSsconfCertFiles(master) > + _AssertSsconfCertFiles() > AssertCommand(["gnt-cluster", "verify"]) > > # Restore RAPI certificate > AssertCommand(["gnt-cluster", "renew-crypto", "--force", > "--rapi-certificate=%s" % rapi_cert_backup]) > - _AssertSsconfCertFiles(master) > + _AssertSsconfCertFiles() > AssertCommand(["gnt-cluster", "verify"]) > finally: > AssertCommand(["rm", "-f", rapi_cert_backup]) > -- > 2.2.0.rc0.207.ga3a616c > > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Geschäftsführer: Graham Law, Christine Elizabeth Flores Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
