8:17 a.m.
Greetings,
From bug#559290, it's looking more like 512M for an x86_64 install
is not sufficient. While that discovery process is underway, I'd like to increase the
default guest RAM size from 512 to 768. Additionally, I found that being able to change
this value from the command-line was very helpful. The following patch add a command-line
argument to install.py to support changing the RAM size of the guest.
Comments/concerns appreciated.
Thanks,
James
8:17 a.m.
New subject: [PATCH 3/3] Add support for changing the guest RAM size. Increase default value for RAM from 512 to 768.
---
lib/python/rats.py | 3 +++
lib/python/virtguest.py | 11 ++++++++++-
tests/rats_install/install.py | 23 +++++++++++++++++++----
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/lib/python/rats.py b/lib/python/rats.py
index ec72e43..3adda31 100644
--- a/lib/python/rats.py
+++ b/lib/python/rats.py
@@ -82,6 +82,9 @@ def parse_args():
parser.add_option("-x", "--extra-args",
action="store",
default="",
help="Additional arguments to pass to the kernel booted from the specified
TREEURL")
+ parser.add_option("-r", "--ram", action="store",
type="int", dest="memory",
+ default=768,
+ help="Memory to allocate for guest instance in megabytes (default:
%default)")
(opt, args) = parser.parse_args()
# Validate arguments
diff --git a/lib/python/virtguest.py b/lib/python/virtguest.py
index a916dea..e2200ee 100644
--- a/lib/python/virtguest.py
+++ b/lib/python/virtguest.py
@@ -159,7 +159,16 @@ class VirtGuest(object):
return data
self.dot(':/\n')
- def create(self, location, ram=512, disksize=8, extra_args='', serial=True):
+ def create(self, location, ram=768, disksize=8, extra_args='', serial=True):
+ '''
+ Create a virtual guest by calling `virt-install` with appropriate arguments
+
+ @param location: A directory containing install images
+ @param ram: Size of memory (in megabytes) to allocate for guest
+ @param disksize: Size of disk (in gigabytes) to allocate for guest
+ @param extra_args: Additional boot arguments for the guest
+ @raises RuntimeError: If the return value from `virt-install` is non-zero
+ '''
if serial:
extra_args += ' serial console=ttyS0'
virt_args = [
diff --git a/tests/rats_install/install.py b/tests/rats_install/install.py
index a6d7394..c596239 100755
--- a/tests/rats_install/install.py
+++ b/tests/rats_install/install.py
@@ -91,8 +91,23 @@ def get_initrd(treeinfo):
initrd = c.get('images-%s' % arch,'initrd')
return initrd
-def create_guest(imgdir, name="RATS", kickstart=None, minimon=None, url=None,
extra_args=""):
- '''Attempt to create a new virt guest using the given
data'''
+def create_guest(imgdir, name="RATS", memory=768, kickstart=None, minimon=None,
url=None, extra_args=""):
+ '''
+ Attempt to create a new virt guest using the given data
+
+ @param imgdir: A directory containing install images
+ @param name: Preferred guest name. If a guest with matching name already
+ exists, a new name will be selected by appending a unique number.
+ @param memory: Size of memory (in megabytes) to allocate for guest.
+ @param kickstart: Path to local kickstart file to use for install.
+ @param minimon: Path to local minimon script to monitor install progress.
+ Script will be placed inside initrd.img and initiated during %pre
+ kickstart.
+ @param url: URL of remote install source added to kickstart file.
+ @param extra_args: Additional boot arguments for the guest.
+ @return: Object of type autoqa.virtguest.VirtGuest
+ '''
+
if kickstart is None:
kickstart = os.path.join(config.bindir, "ks.cfg")
if minimon is None:
@@ -150,7 +165,7 @@ def create_guest(imgdir, name="RATS", kickstart=None,
minimon=None, url=None, ex
guest = VirtGuest(name="%s_%u" % (name, counter))
print " new guest name: %s" % guest.name
print "starting virt guest"
- guest.create(location=imgdir, extra_args=extra_args)
+ guest.create(location=imgdir, ram=memory, extra_args=extra_args)
guest.minimon = minimon_server # save MinimonServer object
guest.steplist = [] # A place to save the list of anaconda steps
return guest
@@ -329,7 +344,7 @@ if __name__ == '__main__':
if opt.image_url:
opt.extra_args = opt.extra_args + " stage2=%s/images/install.img" %
opt.image_url
- guest = create_guest(config.scratchdir, url=baseuri, extra_args=opt.extra_args)
+ guest = create_guest(config.scratchdir, url=baseuri, memory=opt.memory,
extra_args=opt.extra_args)
try:
print "\n== kernel boot test =="
--
1.6.6
3:47 p.m.
New subject: [PATCH 3/3] Add support for changing the guest RAM size. Increase default value for RAM from 512 to 768.
On Wed, 2010-02-10 at 09:17 -0500, James Laska wrote:
---
lib/python/rats.py | 3 +++
lib/python/virtguest.py | 11 ++++++++++-
tests/rats_install/install.py | 23 +++++++++++++++++++----
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/lib/python/rats.py b/lib/python/rats.py
index ec72e43..3adda31 100644
--- a/lib/python/rats.py
+++ b/lib/python/rats.py
@@ -82,6 +82,9 @@ def parse_args():
parser.add_option("-x", "--extra-args",
action="store",
default="",
help="Additional arguments to pass to the kernel booted from the specified
TREEURL")
+ parser.add_option("-r", "--ram", action="store",
type="int", dest="memory",
+ default=768,
+ help="Memory to allocate for guest instance in megabytes (default:
%default)")
(opt, args) = parser.parse_args()
I'd prefer that options that are only needed for one test be defined
inside that test. So it'd be better if we could define this option
inside install.py - it's kind of silly that you can pass --ram=768 to
sanity.py.
Perhaps rats.parse_args() could take an optional OptionGroup as input,
so tests can define their own arguments to add to the default rats
parser?
The rest of the patch looks good to me.
-w
2:12 p.m.
New subject: [PATCH 3/3] Add support for changing the guest RAM size. Increase default value for RAM from 512 to 768.
On Fri, 2010-02-12 at 16:47 -0500, Will Woods wrote:
On Wed, 2010-02-10 at 09:17 -0500, James Laska wrote:
> ---
> lib/python/rats.py | 3 +++
> lib/python/virtguest.py | 11 ++++++++++-
> tests/rats_install/install.py | 23 +++++++++++++++++++----
> 3 files changed, 32 insertions(+), 5 deletions(-)
>
> diff --git a/lib/python/rats.py b/lib/python/rats.py
> index ec72e43..3adda31 100644
> --- a/lib/python/rats.py
> +++ b/lib/python/rats.py
> @@ -82,6 +82,9 @@ def parse_args():
> parser.add_option("-x", "--extra-args",
action="store",
> default="",
> help="Additional arguments to pass to the kernel booted from the
specified TREEURL")
> + parser.add_option("-r", "--ram", action="store",
type="int", dest="memory",
> + default=768,
> + help="Memory to allocate for guest instance in megabytes (default:
%default)")
> (opt, args) = parser.parse_args()
I'd prefer that options that are only needed for one test be defined
inside that test. So it'd be better if we could define this option
inside install.py - it's kind of silly that you can pass --ram=768 to
sanity.py.
Perhaps rats.parse_args() could take an optional OptionGroup as input,
so tests can define their own arguments to add to the default rats
parser?
Good idea. I looked into this a bit and it seems that you can't just
pass an OptionGroup in as an argument since OptionGroup requires the
parser (OptionParser) when instantiated.
Instead, I looked at how other tools use OptionGroups, particularly
the /usr/bin/*virt* tools. I opted to create a RatsOptionParser class
(subclass of OptionParser) that the RATS tests can then use for argument
handling. This duplicates some code in each of the tests, but not to
the level which I'm concerned.
I've tested this patch with both sanity.py and install.py and things
work as expected. If no comments/concerns, I'll push this along with
the previous rats_install patches.
Thanks,
James
5:40 p.m.
New subject: [PATCH] Create RatsOptionParser class that allows for extensions using OptionGroup. Rework rats_install and rats_sanity to use RatsOptionParser.
---
lib/python/rats.py | 66 +++++++++++++++-------------------------
tests/rats_install/install.py | 61 ++++++++++++++++++++++++++++++++-----
tests/rats_sanity/sanity.py | 35 +++++++++++++++++-----
3 files changed, 104 insertions(+), 58 deletions(-)
diff --git a/lib/python/rats.py b/lib/python/rats.py
index 3adda31..03b2148 100644
--- a/lib/python/rats.py
+++ b/lib/python/rats.py
@@ -61,48 +61,32 @@ def report_results(testlist, keyvals, url=None, username='',
password=''):
# TODO: handle other statuses (e.g. WARN)
irb.send_request('/add_result', auth=True, req_params=params)
-def parse_args():
- archlist = ['i386', 'x86_64', 'ppc']
- parser = optparse.OptionParser(usage="%prog [options] TREEURL")
- parser.add_option("-a", "--arch", action="store",
type="choice",
- choices=archlist, default=util.get_basearch(),
- help="target architecture (%default)")
- parser.add_option("-s", "--scratchdir",
action="store",
- default=config.scratchdir,
- help="scratch dir for downloaded/generated files (%default)")
- parser.add_option("-l", "--logdir", action="store",
- default=config.logdir,
- help="write logs to this dir (%default)")
- parser.add_option("-b", "--bindir", action="store",
- default=config.bindir,
- help="binary dir - contains minimon, ks.cfg, etc. (%default)")
- parser.add_option("-i", "--image-url", action="store",
- default="",
- help="Specify alternative URL for boot and install images")
- parser.add_option("-x", "--extra-args",
action="store",
- default="",
- help="Additional arguments to pass to the kernel booted from the specified
TREEURL")
- parser.add_option("-r", "--ram", action="store",
type="int", dest="memory",
- default=768,
- help="Memory to allocate for guest instance in megabytes (default:
%default)")
- (opt, args) = parser.parse_args()
+class RatsOptionParser(optparse.OptionParser):
- # Validate arguments
- if len(args) != 1:
- parser.error("incorrect number of arguments")
+ def __init__(self, *args, **kwargs):
+ optparse.OptionParser.__init__(self, *args, **kwargs)
- # Set the default URL prefix for all urlgrabber operations
- url_prefix = opt.image_url or args[0]
- if not url_prefix.endswith('/'):
- url_prefix = url_prefix + '/'
- util.grabber.opts.prefix = url_prefix
+ # RATS-specific options
+ self.set_usage("%prog [options] TREEURL")
- # Process TREEURL
- baseurl = args[0]
- if not baseurl.endswith('/'):
- baseurl = baseurl + '/'
+ archlist = ['i386', 'x86_64', 'ppc']
+ self.add_option("-a", "--arch", action="store",
type="choice",
+ choices=archlist, default=util.get_basearch(),
+ help="target architecture (%default)")
+ self.add_option("-s", "--scratchdir",
action="store",
+ default=config.scratchdir,
+ help="scratch dir for downloaded/generated files (%default)")
+ self.add_option("-l", "--logdir", action="store",
+ default=config.logdir,
+ help="write logs to this dir (%default)")
+ self.add_option("-b", "--bindir", action="store",
+ default=config.bindir,
+ help="binary dir - contains minimon, ks.cfg, etc. (%default)")
- config.set_scratchdir(opt.scratchdir)
- config.logdir = opt.logdir
- config.bindir = opt.bindir
- return (opt, baseurl)
+ def check_values(self, values, args):
+
+ # Was a TREEURL supplied?
+ if len(args) != 1:
+ parser.error("incorrect number of arguments")
+
+ return optparse.OptionParser.check_values(self, values, args)
diff --git a/tests/rats_install/install.py b/tests/rats_install/install.py
index c596239..ff6a692 100755
--- a/tests/rats_install/install.py
+++ b/tests/rats_install/install.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
# Rawhide Acceptance Test Suite - install testing
-#
+#
# basic usage: ./install.py treeurl
#
# Copyright 2009, Red Hat, Inc.
@@ -27,6 +27,7 @@ import gzip
import time
import ConfigParser
import re
+import optparse
from subprocess import *
from minimon import MinimonServer
from autoqa import rats, util, config
@@ -44,14 +45,14 @@ def installer_image_test(arch):
print "Failed to download .treeinfo: %s" % str(e)
return False
c.read(treeinfo)
-
- # 2. confirm that the arch listed in the [general] section is correct
+
+ # 2. confirm that the arch listed in the [general] section is correct
util.check("[general] section in .treeinfo",
c.has_section('general'))
util.check("arch = %s in [general]" % arch,
c.get('general','arch') == arch)
timestamp = float(c.get('general','timestamp'))
-
+
# 3. confirm that the files listed in the [images-$ARCH] section are present
- # and non-empty
+ # and non-empty
img_s = 'images-%s' % arch
util.check("[%s] section" % img_s, c.has_section(img_s))
util.check("kernel", c.has_option(img_s,'kernel'))
@@ -65,13 +66,13 @@ def installer_image_test(arch):
relpath = c.get('stage2','mainimage')
print "stage2 mainimage: %s" % os.path.basename(relpath)
fetchlist.append(relpath)
-
- # 5. confirm that the listed images are present and non-empty
+
+ # 5. confirm that the listed images are present and non-empty
for relpath in fetchlist:
loc = util.simplegrab(relpath)
util.check("%s non-empty" % os.path.basename(relpath),
util.nonempty(loc))
localfile[relpath] = loc
-
+
# 6. check that each of the listed files matches the checksum specified in
# the [checksum] section
util.check("[checksum] section", c.has_section('checksums'))
@@ -324,15 +325,57 @@ def system_sanity():
print msg
return False
+def parse_args():
+ # establish install-specific command-line options
+ parser = rats.RatsOptionParser()
+
+ optgroup = optparse.OptionGroup(parser, "Installation Options")
+ optgroup.add_option("-i", "--image-url",
action="store",
+ default="",
+ help="Specify alternative URL for boot and install images")
+ optgroup.add_option("-x", "--extra-args",
action="store",
+ default="",
+ help="Additional arguments to pass to the kernel booted from the specified
TREEURL")
+ optgroup.add_option("-r", "--ram", action="store",
type="int", dest="memory",
+ default=768,
+ help="Memory to allocate for guest instance in megabytes (default:
%default)")
+ parser.add_option_group(optgroup)
+
+ # Process command-line arguments
+ (opt, args) = parser.parse_args()
+
+ # Process TREEURL
+ baseuri = args[0]
+ if not baseuri.endswith('/'):
+ baseuri = baseuri + '/'
+
+ # Process IMAGEURL
+ url_prefix = opt.image_url or baseuri
+ if not url_prefix.endswith('/'):
+ url_prefix = url_prefix + '/'
+
+ # Set the default URL prefix for future urlgrabber operations
+ util.grabber.opts.prefix = url_prefix
+
+ config.set_scratchdir(opt.scratchdir)
+ config.logdir = opt.logdir
+ config.bindir = opt.bindir
+ return (opt, baseuri)
+
#http://fedoraproject.org/wiki/QA:Rawhide_Acceptance_Test_Plan#Installability_2
if __name__ == '__main__':
- (opt, baseuri) = rats.parse_args()
+
+ # Process command-line arguments
+ (opt, baseuri) = parse_args()
+
+ # Environment sanity checks
if not os.getuid() == 0:
print "ERROR: this can't be run as a normal user (yet)"
sys.exit(1)
if not system_sanity():
sys.exit(1)
+ # Start testing
print "== installer image sanity test =="
timestamp = util.test("images", installer_image_test(opt.arch))
util.write_keyval("treeinfo_timestamp", timestamp)
diff --git a/tests/rats_sanity/sanity.py b/tests/rats_sanity/sanity.py
index 40d226e..82bc21a 100755
--- a/tests/rats_sanity/sanity.py
+++ b/tests/rats_sanity/sanity.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
# Rawhide Acceptance Test Suite - repo sanity testing
-#
+#
# basic usage: ./sanity.py treeurl
#
# Copyright 2009, Red Hat, Inc.
@@ -131,9 +131,9 @@ def critpath_closure_test(start_list):
name_list.remove(name)
# TODO this isn't coming out right for i386
- print "%u packages in critical path (+%u multiarch)" % (len(name_list),
+ print "%u packages in critical path (+%u multiarch)" % (len(name_list),
len(pkg_list)-len(name_list))
- print "%u rejected package names: %s" % (len(skipped_list),
+ print "%u rejected package names: %s" % (len(skipped_list),
" ".join(skipped_list))
return pkg_list
@@ -153,8 +153,27 @@ def critpath_integrity_test(critpath_pkgs):
all_ok = False
return all_ok
+def parse_args():
+
+ # Process command-line arguments
+ parser = rats.RatsOptionParser()
+ (opt, args) = parser.parse_args()
+
+ # Process TREEURL
+ baseuri = args[0]
+ if not baseuri.endswith('/'):
+ baseuri = baseuri + '/'
+
+ # Set the default URL prefix for future urlgrabber operations
+ util.grabber.opts.prefix = baseuri
+
+ config.set_scratchdir(opt.scratchdir)
+ config.logdir = opt.logdir
+ config.bindir = opt.bindir
+ return (opt, baseuri)
+
if __name__ == '__main__':
- (opt, baseuri) = rats.parse_args()
+ (opt, baseuri) = parse_args()
my = yum.YumBase()
if opt.arch != util.get_basearch():
@@ -166,13 +185,13 @@ if __name__ == '__main__':
my.add_enable_repo('rats-repo-%s' % opt.arch, baseurls=[baseuri])
# https://fedoraproject.org/wiki/QA:Rawhide_Acceptance_Test_Plan#Repo_Sanity_2
-
+
print "== repodata validity test =="
util.test("repodata", repodata_validity_test())
print "\n== comps validity test =="
util.test("comps", comps_validity_test())
-
+
(maj, min, sub) = yum.__version_info__
if (maj < 3 or min < 2 or sub < 24) and opt.arch != util.get_basearch():
print "\nWARNING: yum < 3.2.24 may be unable to depsolve other
arches."
@@ -185,8 +204,8 @@ if __name__ == '__main__':
namelist = set([p.name.encode('utf8') for p in critpath_pkgs])
util.write_keyval("critpath_count", len(namelist))
util.writelog("critpath.log", "\n".join(sorted(namelist)))
-
+
print "\n== critical path integrity test =="
util.test("critpath_integrity", critpath_integrity_test(critpath_pkgs))
-
+
print "\n== testing complete =="
--
1.6.6.1
2:57 p.m.
New subject: [PATCH] Create RatsOptionParser class that allows for extensions using OptionGroup. Rework rats_install and rats_sanity to use RatsOptionParser.
On Fri, 2010-02-26 at 18:40 -0500, James Laska wrote:
---
lib/python/rats.py | 66 +++++++++++++++-------------------------
tests/rats_install/install.py | 61 ++++++++++++++++++++++++++++++++-----
tests/rats_sanity/sanity.py | 35 +++++++++++++++++-----
3 files changed, 104 insertions(+), 58 deletions(-)
I think I see what you're trying to do here:
1) keep a common base parser for all rats tests, and
2) allow the individual tests to add to that parser
which is good. But actually subclassing OptionParser - and adding
RATS-specific code to its __init__ - seems like an odd way to do it.
rats.parse_args() is already a common base option parser; AFAICT all you
really want to do is add 3 new options to install.py.
It'd seem much simpler to just change rats.parse_args() (which contains
the common base parser) to add an optional OptionGroup argument:
def parse_args(extra_optiongroup=None):
...
if extra_optiongroup:
parser.add_option_group(extra_optiongroup)
...
and then, in install.py, create the OptionGroup (which you're already
doing) and pass it to rats.parse_args(optiongroup).
Am I missing something? It looks like all the other parsing is identical
in both new copies of parse_args.
-w
3:04 p.m.
New subject: [PATCH] Create RatsOptionParser class that allows for extensions using OptionGroup. Rework rats_install and rats_sanity to use RatsOptionParser.
On Wed, 2010-03-03 at 15:57 -0500, Will Woods wrote:
On Fri, 2010-02-26 at 18:40 -0500, James Laska wrote:
> ---
> lib/python/rats.py | 66 +++++++++++++++-------------------------
> tests/rats_install/install.py | 61 ++++++++++++++++++++++++++++++++-----
> tests/rats_sanity/sanity.py | 35 +++++++++++++++++-----
> 3 files changed, 104 insertions(+), 58 deletions(-)
I think I see what you're trying to do here:
1) keep a common base parser for all rats tests, and
2) allow the individual tests to add to that parser
which is good. But actually subclassing OptionParser - and adding
RATS-specific code to its __init__ - seems like an odd way to do it.
rats.parse_args() is already a common base option parser; AFAICT all you
really want to do is add 3 new options to install.py.
It'd seem much simpler to just change rats.parse_args() (which contains
the common base parser) to add an optional OptionGroup argument:
def parse_args(extra_optiongroup=None):
...
if extra_optiongroup:
parser.add_option_group(extra_optiongroup)
...
and then, in install.py, create the OptionGroup (which you're already
doing) and pass it to rats.parse_args(optiongroup).
Am I missing something? It looks like all the other parsing is identical
in both new copies of parse_args.
Thanks for the feedback!
That was my preference too. I tried it originally, but it seems that
you must provide OptionParser object when creating an OptionGroup
object. So that left me with a chicken vs egg problem.
From help(optparse.OptionGroup)...
class OptionGroup(OptionContainer)
| Methods defined here:
|
| __init__(self, parser, title, description=None)
The approach I took is a bit different than what was done previously,
but matches the behavior used by all the /usr/bin/virt* tools, so I
didn't think it would be too incorrect.
How can I create an OptionGroup in install.py and pass it into
rats.parse_args(), when I need an OptionParser is needed when creating
the OptionGroup?
Thanks,
James
11:35 a.m.
New subject: [PATCH] Create RatsOptionParser class that allows for extensions using OptionGroup. Rework rats_install and rats_sanity to use RatsOptionParser.
On Wed, 2010-03-03 at 16:04 -0500, James Laska wrote:
On Wed, 2010-03-03 at 15:57 -0500, Will Woods wrote:
> On Fri, 2010-02-26 at 18:40 -0500, James Laska wrote:
> > ---
> > lib/python/rats.py | 66 +++++++++++++++-------------------------
> > tests/rats_install/install.py | 61 ++++++++++++++++++++++++++++++++-----
> > tests/rats_sanity/sanity.py | 35 +++++++++++++++++-----
> > 3 files changed, 104 insertions(+), 58 deletions(-)
>
> I think I see what you're trying to do here:
>
> 1) keep a common base parser for all rats tests, and
> 2) allow the individual tests to add to that parser
>
> which is good. But actually subclassing OptionParser - and adding
> RATS-specific code to its __init__ - seems like an odd way to do it.
>
> rats.parse_args() is already a common base option parser; AFAICT all you
> really want to do is add 3 new options to install.py.
>
> It'd seem much simpler to just change rats.parse_args() (which contains
> the common base parser) to add an optional OptionGroup argument:
>
> def parse_args(extra_optiongroup=None):
> ...
> if extra_optiongroup:
> parser.add_option_group(extra_optiongroup)
> ...
>
> and then, in install.py, create the OptionGroup (which you're already
> doing) and pass it to rats.parse_args(optiongroup).
>
> Am I missing something? It looks like all the other parsing is identical
> in both new copies of parse_args.
Thanks for the feedback!
That was my preference too. I tried it originally, but it seems that
you must provide OptionParser object when creating an OptionGroup
object. So that left me with a chicken vs egg problem.
From help(optparse.OptionGroup)...
class OptionGroup(OptionContainer)
| Methods defined here:
|
| __init__(self, parser, title, description=None)
The approach I took is a bit different than what was done previously,
but matches the behavior used by all the /usr/bin/virt* tools, so I
didn't think it would be too incorrect.
How can I create an OptionGroup in install.py and pass it into
rats.parse_args(), when I need an OptionParser is needed when creating
the OptionGroup?
Will and I spoke on #fedora-qa briefly and came up with a new solution
that doesn't involve subclassing OptionParser.
I'll revise and resubmit the patch shortly.
Thanks,
James
12:43 p.m.
New subject: [PATCH 1/2] Add support for creating test specific OptionGroup() objects.
---
lib/python/rats.py | 30 +++++++++++++-----------------
tests/rats_install/install.py | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/lib/python/rats.py b/lib/python/rats.py
index 3adda31..f40be66 100644
--- a/lib/python/rats.py
+++ b/lib/python/rats.py
@@ -61,9 +61,11 @@ def report_results(testlist, keyvals, url=None, username='',
password=''):
# TODO: handle other statuses (e.g. WARN)
irb.send_request('/add_result', auth=True, req_params=params)
-def parse_args():
- archlist = ['i386', 'x86_64', 'ppc']
+def get_parser():
+
parser = optparse.OptionParser(usage="%prog [options] TREEURL")
+
+ archlist = ['i386', 'x86_64', 'ppc']
parser.add_option("-a", "--arch", action="store",
type="choice",
choices=archlist, default=util.get_basearch(),
help="target architecture (%default)")
@@ -76,33 +78,27 @@ def parse_args():
parser.add_option("-b", "--bindir", action="store",
default=config.bindir,
help="binary dir - contains minimon, ks.cfg, etc. (%default)")
- parser.add_option("-i", "--image-url", action="store",
- default="",
- help="Specify alternative URL for boot and install images")
- parser.add_option("-x", "--extra-args",
action="store",
- default="",
- help="Additional arguments to pass to the kernel booted from the specified
TREEURL")
- parser.add_option("-r", "--ram", action="store",
type="int", dest="memory",
- default=768,
- help="Memory to allocate for guest instance in megabytes (default:
%default)")
+ return parser
+
+def parse_args(parser=None):
+ # If no parser supplied, get one
+ if parser is None:
+ parser = get_parser()
+
(opt, args) = parser.parse_args()
# Validate arguments
if len(args) != 1:
parser.error("incorrect number of arguments")
- # Set the default URL prefix for all urlgrabber operations
- url_prefix = opt.image_url or args[0]
- if not url_prefix.endswith('/'):
- url_prefix = url_prefix + '/'
- util.grabber.opts.prefix = url_prefix
-
# Process TREEURL
baseurl = args[0]
if not baseurl.endswith('/'):
baseurl = baseurl + '/'
+ util.grabber.opts.prefix = baseurl
config.set_scratchdir(opt.scratchdir)
config.logdir = opt.logdir
config.bindir = opt.bindir
return (opt, baseurl)
+
diff --git a/tests/rats_install/install.py b/tests/rats_install/install.py
index c596239..923d089 100755
--- a/tests/rats_install/install.py
+++ b/tests/rats_install/install.py
@@ -27,6 +27,7 @@ import gzip
import time
import ConfigParser
import re
+import optparse
from subprocess import *
from minimon import MinimonServer
from autoqa import rats, util, config
@@ -324,15 +325,49 @@ def system_sanity():
print msg
return False
+def parse_args():
+
+ # establish install-specific command-line options
+ parser = rats.get_parser()
+ optgroup = optparse.OptionGroup(parser, "Installation Options")
+ optgroup.add_option("-i", "--image-url",
action="store",
+ default="",
+ help="Specify alternative URL for boot and install images")
+ optgroup.add_option("-x", "--extra-args",
action="store",
+ default="",
+ help="Additional arguments to pass to the kernel booted from the specified
TREEURL")
+ optgroup.add_option("-r", "--ram", action="store",
type="int", dest="memory",
+ default=768,
+ help="Memory to allocate for guest instance in megabytes (default:
%default)")
+ parser.add_option_group(optgroup)
+
+ # Process command-line arguments
+ (opt, baseuri) = rats.parse_args(parser)
+
+ # Set the default URL prefix for subsequent urlgrabber operations
+ if opt.image_url:
+ url_prefix = opt.image_url
+ if not url_prefix.endswith('/'):
+ url_prefix = url_prefix + '/'
+ print "Setting util.grabber prefix"
+ util.grabber.opts.prefix = url_prefix
+
+ return (opt, baseuri)
+
#http://fedoraproject.org/wiki/QA:Rawhide_Acceptance_Test_Plan#Installability_2
if __name__ == '__main__':
- (opt, baseuri) = rats.parse_args()
+
+ # Process command-line arguments
+ (opt, baseuri) = parse_args()
+
+ # Environment sanity checks
if not os.getuid() == 0:
print "ERROR: this can't be run as a normal user (yet)"
sys.exit(1)
if not system_sanity():
sys.exit(1)
+ # Start testing
print "== installer image sanity test =="
timestamp = util.test("images", installer_image_test(opt.arch))
util.write_keyval("treeinfo_timestamp", timestamp)
--
1.6.6.1
12:54 p.m.
New subject: [PATCH 1/2] Add support for creating test specific OptionGroup() objects.
On Thu, 2010-03-04 at 13:43 -0500, James Laska wrote:
---
lib/python/rats.py | 30 +++++++++++++-----------------
tests/rats_install/install.py | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 49 insertions(+), 18 deletions(-)
Looks great. Assuming you've tested it, please apply to master.
-w
12:44 p.m.
New subject: [PATCH 2/2] Whitespace cleanup
---
tests/rats_install/install.py | 16 ++++++++--------
tests/rats_sanity/sanity.py | 14 +++++++-------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tests/rats_install/install.py b/tests/rats_install/install.py
index 923d089..5865e03 100755
--- a/tests/rats_install/install.py
+++ b/tests/rats_install/install.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
# Rawhide Acceptance Test Suite - install testing
-#
+#
# basic usage: ./install.py treeurl
#
# Copyright 2009, Red Hat, Inc.
@@ -45,14 +45,14 @@ def installer_image_test(arch):
print "Failed to download .treeinfo: %s" % str(e)
return False
c.read(treeinfo)
-
- # 2. confirm that the arch listed in the [general] section is correct
+
+ # 2. confirm that the arch listed in the [general] section is correct
util.check("[general] section in .treeinfo",
c.has_section('general'))
util.check("arch = %s in [general]" % arch,
c.get('general','arch') == arch)
timestamp = float(c.get('general','timestamp'))
-
+
# 3. confirm that the files listed in the [images-$ARCH] section are present
- # and non-empty
+ # and non-empty
img_s = 'images-%s' % arch
util.check("[%s] section" % img_s, c.has_section(img_s))
util.check("kernel", c.has_option(img_s,'kernel'))
@@ -66,13 +66,13 @@ def installer_image_test(arch):
relpath = c.get('stage2','mainimage')
print "stage2 mainimage: %s" % os.path.basename(relpath)
fetchlist.append(relpath)
-
- # 5. confirm that the listed images are present and non-empty
+
+ # 5. confirm that the listed images are present and non-empty
for relpath in fetchlist:
loc = util.simplegrab(relpath)
util.check("%s non-empty" % os.path.basename(relpath),
util.nonempty(loc))
localfile[relpath] = loc
-
+
# 6. check that each of the listed files matches the checksum specified in
# the [checksum] section
util.check("[checksum] section", c.has_section('checksums'))
diff --git a/tests/rats_sanity/sanity.py b/tests/rats_sanity/sanity.py
index 40d226e..bf408d1 100755
--- a/tests/rats_sanity/sanity.py
+++ b/tests/rats_sanity/sanity.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
# Rawhide Acceptance Test Suite - repo sanity testing
-#
+#
# basic usage: ./sanity.py treeurl
#
# Copyright 2009, Red Hat, Inc.
@@ -131,9 +131,9 @@ def critpath_closure_test(start_list):
name_list.remove(name)
# TODO this isn't coming out right for i386
- print "%u packages in critical path (+%u multiarch)" % (len(name_list),
+ print "%u packages in critical path (+%u multiarch)" % (len(name_list),
len(pkg_list)-len(name_list))
- print "%u rejected package names: %s" % (len(skipped_list),
+ print "%u rejected package names: %s" % (len(skipped_list),
" ".join(skipped_list))
return pkg_list
@@ -166,13 +166,13 @@ if __name__ == '__main__':
my.add_enable_repo('rats-repo-%s' % opt.arch, baseurls=[baseuri])
# https://fedoraproject.org/wiki/QA:Rawhide_Acceptance_Test_Plan#Repo_Sanity_2
-
+
print "== repodata validity test =="
util.test("repodata", repodata_validity_test())
print "\n== comps validity test =="
util.test("comps", comps_validity_test())
-
+
(maj, min, sub) = yum.__version_info__
if (maj < 3 or min < 2 or sub < 24) and opt.arch != util.get_basearch():
print "\nWARNING: yum < 3.2.24 may be unable to depsolve other
arches."
@@ -185,8 +185,8 @@ if __name__ == '__main__':
namelist = set([p.name.encode('utf8') for p in critpath_pkgs])
util.write_keyval("critpath_count", len(namelist))
util.writelog("critpath.log", "\n".join(sorted(namelist)))
-
+
print "\n== critical path integrity test =="
util.test("critpath_integrity", critpath_integrity_test(critpath_pkgs))
-
+
print "\n== testing complete =="
--
1.6.6.1
12:54 p.m.
New subject: [PATCH 2/2] Whitespace cleanup
On Thu, 2010-03-04 at 13:44 -0500, James Laska wrote:
---
tests/rats_install/install.py | 16 ++++++++--------
tests/rats_sanity/sanity.py | 14 +++++++-------
2 files changed, 15 insertions(+), 15 deletions(-)
Hooray for cleanups. Please apply to master.
-w
5207
days inactive
5229
days old
autoqa-devel@lists.fedorahosted.org
11 comments
2 participants
participants (2)
-
James Laska -
Will Woods