help='run tests as USER (needs root on testbed)')
pa('','--gain-root', type='string', dest='gainroot',
help='prefix debian/rules binary with GAINROOT')
- pa('-q', '--quiet', action='store_false', dest='quiet', default=False);
+ pa('-q', '--quiet', action='store_true', dest='quiet', default=False);
pa('-d', '--debug', action='count', dest='debuglevel', default=0);
pa('','--gnupg-home', type='string', dest='gnupghome',
default='~/.autopkgtest/gpg',
return []
lno = 0
- def badctrl(m): act.bomb('tests/control line %d: %s' % (lno, m))
- stz = None # stz[field_name][index] = (lno, value)
+ def badctrl(m): testbed.bomb('tests/control line %d: %s' % (lno, m))
+ stz = { } # stz[field_name][index] = (lno, value)
# special field names:
# stz[' lno'] = number
# stz[' tests'] = list of Test objects
+ # empty dictionary means we're between stanzas
+ def in_stanza(stz):
+ return stz.has_key(' lno')
def end_stanza(stz):
- if stz is None: return
+ if not in_stanza(stz): return
stz[' errs'] = 0
- stanzas.append(stz)
- stz = None
+ stanzas.append(stz.copy())
+ stz.clear()
hcurrent = None
- initre = regexp.compile('([A-Z][-0-9a-z]*)\s*\:\s*(.*)$')
+ initre = regexp.compile('([A-Z][-0-9a-zA-Z]*)\s*\:\s*(.*)$')
while 1:
l = control.readline()
if not l: break
if initmat:
(fname, l) = initmat.groups()
fname = string.capwords(fname)
- if stz is None:
+ if not in_stanza(stz):
stz = { ' lno': lno, ' tests': [] }
if not stz.has_key(fname): stz[fname] = [ ]
hcurrent = stz[fname]