Typos in the patch headline "instance" and "available"
On Thu, Oct 17, 2013 at 2:01 PM, Klaus Aehlig <[email protected]> wrote: > The knowledge about which instance creating tests are > available is best kept in the module on istances. Moreover, > it is not only used by RunInstanceTests, but will > also be needed by the upgrade test. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > qa/ganeti-qa.py | 17 +++-------------- > qa/qa_instance.py | 13 +++++++++++++ > 2 files changed, 16 insertions(+), 14 deletions(-) > > diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py > index 4c8e90f..941f0c4 100755 > --- a/qa/ganeti-qa.py > +++ b/qa/ganeti-qa.py > @@ -703,20 +703,9 @@ def IsExclusiveStorageInstanceTestEnabled(): > > def RunInstanceTests(): > """Create and exercise instances.""" > - instance_tests = [ > - ("instance-add-plain-disk", constants.DT_PLAIN, > - qa_instance.TestInstanceAddWithPlainDisk, 1), > - ("instance-add-drbd-disk", constants.DT_DRBD8, > - qa_instance.TestInstanceAddWithDrbdDisk, 2), > - ("instance-add-diskless", constants.DT_DISKLESS, > - qa_instance.TestInstanceAddDiskless, 1), > - ("instance-add-file", constants.DT_FILE, > - qa_instance.TestInstanceAddFile, 1), > - ("instance-add-shared-file", constants.DT_SHARED_FILE, > - qa_instance.TestInstanceAddSharedFile, 1), > - ] > - > - for (test_name, templ, create_fun, num_nodes) in instance_tests: > + > + for (test_name, templ, create_fun, num_nodes) in \ > + qa_instance.available_instance_tests: > if (qa_config.TestEnabled(test_name) and > qa_config.IsTemplateSupported(templ)): > inodes = qa_config.AcquireManyNodes(num_nodes) > diff --git a/qa/qa_instance.py b/qa/qa_instance.py > index e7d8bb4..f331b57 100644 > --- a/qa/qa_instance.py > +++ b/qa/qa_instance.py > @@ -1084,3 +1084,16 @@ def TestInstanceCreationRestrictedByDiskTemplates(): > "--ipolicy-disk-templates=%s" % > ",".join(enabled_disk_templates)], > fail=False) > + > +available_instance_tests = [ > + ("instance-add-plain-disk", constants.DT_PLAIN, > + TestInstanceAddWithPlainDisk, 1), > + ("instance-add-drbd-disk", constants.DT_DRBD8, > + TestInstanceAddWithDrbdDisk, 2), > + ("instance-add-diskless", constants.DT_DISKLESS, > + TestInstanceAddDiskless, 1), > + ("instance-add-file", constants.DT_FILE, > + TestInstanceAddFile, 1), > + ("instance-add-shared-file", constants.DT_SHARED_FILE, > + TestInstanceAddSharedFile, 1), > + ] > -- > 1.8.4 > > LGTM, thanks -- -- Helga Velroyen | Software Engineer | [email protected] | 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
