mirror of
https://github.com/openSUSE/osc.git
synced 2024-12-25 01:16:14 +01:00
Run autopep8 to fix whitespace issues
This commit is contained in:
parent
b511be20ff
commit
fe59986e1c
@ -26,6 +26,7 @@ class ConfigLineOrder:
|
||||
It keeps track of all lines (including comments) in the _lines list. This list
|
||||
either contains SectionLine() instances or CommentLine() instances.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self._lines = []
|
||||
|
||||
@ -56,7 +57,7 @@ class ConfigLineOrder:
|
||||
self._append(CommentLine(line))
|
||||
|
||||
def keys(self):
|
||||
return [ i.name for i in self._lines if i.type == 'section' ]
|
||||
return [i.name for i in self._lines if i.type == 'section']
|
||||
|
||||
def __setitem__(self, key, value):
|
||||
section = SectionLine(key)
|
||||
@ -75,23 +76,27 @@ class ConfigLineOrder:
|
||||
self._lines.remove(line)
|
||||
|
||||
def __iter__(self):
|
||||
#return self._lines.__iter__()
|
||||
# return self._lines.__iter__()
|
||||
for line in self._lines:
|
||||
if line.type == 'section':
|
||||
yield line.name
|
||||
|
||||
|
||||
class Line:
|
||||
"""Base class for all line objects"""
|
||||
|
||||
def __init__(self, name, type):
|
||||
self.name = name
|
||||
self.type = type
|
||||
|
||||
|
||||
class SectionLine(Line):
|
||||
"""
|
||||
This class represents a [section]. It stores all lines which belongs to
|
||||
this certain section in the _lines list. The _lines list either contains
|
||||
CommentLine() or OptionLine() instances.
|
||||
"""
|
||||
|
||||
def __init__(self, sectname):
|
||||
super().__init__(sectname, 'section')
|
||||
self._lines = []
|
||||
@ -102,7 +107,7 @@ class SectionLine(Line):
|
||||
return line
|
||||
return None
|
||||
|
||||
def _add_option(self, optname, value = None, line = None, sep = '='):
|
||||
def _add_option(self, optname, value=None, line=None, sep='='):
|
||||
if value is None and line is None:
|
||||
raise configparser.Error('Either value or line must be passed in')
|
||||
elif value and line:
|
||||
@ -123,10 +128,10 @@ class SectionLine(Line):
|
||||
return dict(self.items())
|
||||
|
||||
def items(self):
|
||||
return [ (i.name, i.value) for i in self._lines if i.type == 'option' ]
|
||||
return [(i.name, i.value) for i in self._lines if i.type == 'option']
|
||||
|
||||
def keys(self):
|
||||
return [ i.name for i in self._lines ]
|
||||
return [i.name for i in self._lines]
|
||||
|
||||
def __setitem__(self, key, val):
|
||||
self._add_option(key, val)
|
||||
@ -154,12 +159,14 @@ class SectionLine(Line):
|
||||
|
||||
class CommentLine(Line):
|
||||
"""Store a commentline"""
|
||||
|
||||
def __init__(self, line):
|
||||
super().__init__(line.strip('\n'), 'comment')
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class OptionLine(Line):
|
||||
"""
|
||||
This class represents an option. The class' ``name`` attribute is used
|
||||
@ -202,6 +209,7 @@ class OscConfigParser(configparser.ConfigParser):
|
||||
In order to keep the order and the format it makes use of the ConfigLineOrder()
|
||||
class.
|
||||
"""
|
||||
|
||||
def __init__(self, defaults=None):
|
||||
super().__init__(defaults or {})
|
||||
self._sections = ConfigLineOrder()
|
||||
@ -279,7 +287,7 @@ class OscConfigParser(configparser.ConfigParser):
|
||||
# ';' is a comment delimiter only if it follows
|
||||
# a spacing character
|
||||
pos = optval.find(';')
|
||||
if pos != -1 and optval[pos-1].isspace():
|
||||
if pos != -1 and optval[pos - 1].isspace():
|
||||
optval = optval[:pos]
|
||||
optval = optval.strip()
|
||||
# allow empty values
|
||||
@ -300,9 +308,9 @@ class OscConfigParser(configparser.ConfigParser):
|
||||
e.append(lineno, repr(line))
|
||||
# if any parsing errors occurred, raise an exception
|
||||
if e:
|
||||
raise e # pylint: disable-msg=E0702
|
||||
raise e # pylint: disable-msg=E0702
|
||||
|
||||
def write(self, fp, comments = False):
|
||||
def write(self, fp, comments=False):
|
||||
"""
|
||||
write the configuration file. If comments is True all comments etc.
|
||||
will be written to fp otherwise the ConfigParsers' default write method
|
||||
|
||||
@ -111,7 +111,7 @@ def run(prg, argv=None):
|
||||
if b'<summary>' in body:
|
||||
msg = body.split(b'<summary>')[1]
|
||||
msg = msg.split(b'</summary>')[0]
|
||||
msg = msg.replace(b'<', b'<').replace(b'>' , b'>').replace(b'&', b'&')
|
||||
msg = msg.replace(b'<', b'<').replace(b'>', b'>').replace(b'&', b'&')
|
||||
print(decode_it(msg), file=sys.stderr)
|
||||
if e.code >= 500 and e.code <= 599:
|
||||
print('\nRequest: %s' % e.filename)
|
||||
@ -164,9 +164,9 @@ def run(prg, argv=None):
|
||||
except (oscerr.PackageExists, oscerr.PackageMissing, oscerr.WorkingCopyInconsistent) as e:
|
||||
print(e.msg, file=sys.stderr)
|
||||
except oscerr.PackageInternalError as e:
|
||||
print('a package internal error occured\n' \
|
||||
'please file a bug and attach your current package working copy ' \
|
||||
'and the following traceback to it:', file=sys.stderr)
|
||||
print('a package internal error occured\n'
|
||||
'please file a bug and attach your current package working copy '
|
||||
'and the following traceback to it:', file=sys.stderr)
|
||||
print(e.msg, file=sys.stderr)
|
||||
traceback.print_exc(file=sys.stderr)
|
||||
except oscerr.PackageError as e:
|
||||
|
||||
226
osc/build.py
226
osc/build.py
@ -30,45 +30,46 @@ from .util.helper import decode_it
|
||||
|
||||
|
||||
change_personality = {
|
||||
'i686': 'linux32',
|
||||
'i586': 'linux32',
|
||||
'i386': 'linux32',
|
||||
'ppc': 'powerpc32',
|
||||
's390': 's390',
|
||||
'sparc': 'linux32',
|
||||
'sparcv8': 'linux32',
|
||||
}
|
||||
'i686': 'linux32',
|
||||
'i586': 'linux32',
|
||||
'i386': 'linux32',
|
||||
'ppc': 'powerpc32',
|
||||
's390': 's390',
|
||||
'sparc': 'linux32',
|
||||
'sparcv8': 'linux32',
|
||||
}
|
||||
|
||||
can_also_build = {
|
||||
'aarch64': ['aarch64'], # only needed due to used heuristics in build parameter evaluation
|
||||
'armv6l': [ 'armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el' ],
|
||||
'armv7l': [ 'armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el' ],
|
||||
'armv5el': [ 'armv4l', 'armv5l', 'armv5el' ], # not existing arch, just for compatibility
|
||||
'armv6el': [ 'armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el' ], # not existing arch, just for compatibility
|
||||
'armv6hl': [ 'armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el' ],
|
||||
'armv7el': [ 'armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el' ], # not existing arch, just for compatibility
|
||||
'armv7hl': [ 'armv7hl' ], # not existing arch, just for compatibility
|
||||
'armv8el': [ 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el' ], # not existing arch, just for compatibility
|
||||
'armv8l': [ 'armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el' ], # not existing arch, just for compatibility
|
||||
'armv5tel': [ 'armv4l', 'armv5el', 'armv5tel' ],
|
||||
's390x': ['s390' ],
|
||||
'ppc64': [ 'ppc', 'ppc64', 'ppc64p7', 'ppc64le' ],
|
||||
'ppc64le': [ 'ppc64le', 'ppc64' ],
|
||||
'i586': [ 'i386' ],
|
||||
'i686': [ 'i586', 'i386' ],
|
||||
'x86_64': ['i686', 'i586', 'i386' ],
|
||||
'sparc64': ['sparc64v', 'sparcv9v', 'sparcv9', 'sparcv8', 'sparc'],
|
||||
'parisc': ['hppa'],
|
||||
}
|
||||
'aarch64': ['aarch64'], # only needed due to used heuristics in build parameter evaluation
|
||||
'armv6l': ['armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el'],
|
||||
'armv7l': ['armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el'],
|
||||
'armv5el': ['armv4l', 'armv5l', 'armv5el'], # not existing arch, just for compatibility
|
||||
'armv6el': ['armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el'], # not existing arch, just for compatibility
|
||||
'armv6hl': ['armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el'],
|
||||
'armv7el': ['armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el'], # not existing arch, just for compatibility
|
||||
'armv7hl': ['armv7hl'], # not existing arch, just for compatibility
|
||||
'armv8el': ['armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el'], # not existing arch, just for compatibility
|
||||
'armv8l': ['armv4l', 'armv5el', 'armv6el', 'armv7el', 'armv8el'], # not existing arch, just for compatibility
|
||||
'armv5tel': ['armv4l', 'armv5el', 'armv5tel'],
|
||||
's390x': ['s390'],
|
||||
'ppc64': ['ppc', 'ppc64', 'ppc64p7', 'ppc64le'],
|
||||
'ppc64le': ['ppc64le', 'ppc64'],
|
||||
'i586': ['i386'],
|
||||
'i686': ['i586', 'i386'],
|
||||
'x86_64': ['i686', 'i586', 'i386'],
|
||||
'sparc64': ['sparc64v', 'sparcv9v', 'sparcv9', 'sparcv8', 'sparc'],
|
||||
'parisc': ['hppa'],
|
||||
}
|
||||
|
||||
# real arch of this machine
|
||||
hostarch = os.uname()[4]
|
||||
if hostarch == 'i686': # FIXME
|
||||
if hostarch == 'i686': # FIXME
|
||||
hostarch = 'i586'
|
||||
|
||||
if hostarch == 'parisc':
|
||||
hostarch = 'hppa'
|
||||
|
||||
|
||||
class Buildinfo:
|
||||
"""represent the contents of a buildinfo file"""
|
||||
|
||||
@ -176,27 +177,26 @@ class Buildinfo:
|
||||
for node in root.findall('path'):
|
||||
# old simple list for compatibility
|
||||
# XXX: really old? This is currently used for kiwi builds
|
||||
self.pathes.append(node.get('project')+"/"+node.get('repository'))
|
||||
self.pathes.append(node.get('project') + "/" + node.get('repository'))
|
||||
# a hash providing the matching URL for specific repos for newer OBS instances
|
||||
if node.get('url'):
|
||||
baseurl = node.get('url').replace('%', '%%')
|
||||
if config['api_host_options'][apiurl]['downloadurl']:
|
||||
# Add the path element to the download url override.
|
||||
baseurl = config['api_host_options'][apiurl]['downloadurl'] + urlsplit(node.get('url'))[2]
|
||||
self.urls[node.get('project')+"/"+node.get('repository')] = baseurl + '/%(arch)s/%(filename)s'
|
||||
self.urls[node.get('project') + "/" + node.get('repository')] = baseurl + '/%(arch)s/%(filename)s'
|
||||
|
||||
self.vminstall_list = [ dep.name for dep in self.deps if dep.vminstall ]
|
||||
self.preinstall_list = [ dep.name for dep in self.deps if dep.preinstall ]
|
||||
self.runscripts_list = [ dep.name for dep in self.deps if dep.runscripts ]
|
||||
self.noinstall_list = [ dep.name for dep in self.deps if dep.noinstall ]
|
||||
self.installonly_list = [ dep.name for dep in self.deps if dep.installonly ]
|
||||
self.vminstall_list = [dep.name for dep in self.deps if dep.vminstall]
|
||||
self.preinstall_list = [dep.name for dep in self.deps if dep.preinstall]
|
||||
self.runscripts_list = [dep.name for dep in self.deps if dep.runscripts]
|
||||
self.noinstall_list = [dep.name for dep in self.deps if dep.noinstall]
|
||||
self.installonly_list = [dep.name for dep in self.deps if dep.installonly]
|
||||
|
||||
if root.find('preinstallimage') is not None:
|
||||
self.preinstallimage = root.find('preinstallimage')
|
||||
else:
|
||||
self.preinstallimage = None
|
||||
|
||||
|
||||
def has_dep(self, name):
|
||||
for i in self.deps:
|
||||
if i.name == name:
|
||||
@ -215,6 +215,7 @@ class Pac:
|
||||
|
||||
We build a map that's later used to fill our URL templates
|
||||
"""
|
||||
|
||||
def __init__(self, node, buildarch, pacsuffix, apiurl, localpkgs=None):
|
||||
localpkgs = localpkgs or []
|
||||
self.mp = {}
|
||||
@ -223,7 +224,7 @@ class Pac:
|
||||
'project', 'repository', 'sysroot',
|
||||
'preinstall', 'vminstall', 'runscripts',
|
||||
'noinstall', 'installonly', 'notmeta',
|
||||
]:
|
||||
]:
|
||||
self.mp[i] = node.get(i)
|
||||
|
||||
self.mp['buildarch'] = buildarch
|
||||
@ -233,10 +234,10 @@ class Pac:
|
||||
self.mp['name'] = node.get('name') or self.mp['binary']
|
||||
|
||||
# this is not the ideal place to check if the package is a localdep or not
|
||||
localdep = self.mp['name'] in localpkgs # and not self.mp['noinstall']
|
||||
localdep = self.mp['name'] in localpkgs # and not self.mp['noinstall']
|
||||
if not localdep and not (node.get('project') and node.get('repository')):
|
||||
raise oscerr.APIError('incomplete information for package %s, may be caused by a broken project configuration.'
|
||||
% self.mp['name'] )
|
||||
% self.mp['name'])
|
||||
|
||||
if not localdep:
|
||||
self.mp['extproject'] = node.get('project').replace(':', ':/')
|
||||
@ -247,7 +248,7 @@ class Pac:
|
||||
if pacsuffix == 'deb' and not (self.mp['name'] and self.mp['arch'] and self.mp['version']):
|
||||
raise oscerr.APIError(
|
||||
"buildinfo for package %s/%s/%s is incomplete"
|
||||
% (self.mp['name'], self.mp['arch'], self.mp['version']))
|
||||
% (self.mp['name'], self.mp['arch'], self.mp['version']))
|
||||
|
||||
self.mp['apiurl'] = apiurl
|
||||
|
||||
@ -282,7 +283,6 @@ class Pac:
|
||||
# make the content of the dictionary accessible as class attributes
|
||||
self.__dict__.update(self.mp)
|
||||
|
||||
|
||||
def makeurls(self, cachedir, urllist):
|
||||
self.localdir = '%s/%s/%s/%s' % (cachedir, self.project, self.repository, self.repoarch)
|
||||
self.fullfilename = os.path.join(self.localdir, self.canonname)
|
||||
@ -351,6 +351,7 @@ def get_preinstall_image(apiurl, arch, cache_dir, img_info, offline=False):
|
||||
os.rename(ifile_path_part, ifile_path)
|
||||
return (imagefile, imagesource, img_bins)
|
||||
|
||||
|
||||
def get_built_files(pacdir, buildtype):
|
||||
if buildtype == 'spec':
|
||||
debs_dir = os.path.join(pacdir, 'DEBS')
|
||||
@ -442,6 +443,7 @@ def get_built_files(pacdir, buildtype):
|
||||
s_built = ''
|
||||
return s_built, b_built
|
||||
|
||||
|
||||
def get_repo(path):
|
||||
"""Walks up path looking for any repodata directories.
|
||||
|
||||
@ -468,6 +470,7 @@ def get_repo(path):
|
||||
|
||||
return repositoryDirectory
|
||||
|
||||
|
||||
def get_prefer_pkgs(dirs, wanted_arch, type, cpio):
|
||||
paths = []
|
||||
repositories = []
|
||||
@ -503,7 +506,7 @@ def get_prefer_pkgs(dirs, wanted_arch, type, cpio):
|
||||
packageQueries.add(packageQuery)
|
||||
|
||||
prefer_pkgs = {decode_it(name): packageQuery.path()
|
||||
for name, packageQuery in packageQueries.items()}
|
||||
for name, packageQuery in packageQueries.items()}
|
||||
|
||||
depfile = create_deps(packageQueries.values())
|
||||
cpio.add(b'deps', b'\n'.join(depfile))
|
||||
@ -541,6 +544,8 @@ trustprompt = """Would you like to ...
|
||||
1 - always trust packages from '%(project)s'
|
||||
2 - trust packages just this time
|
||||
? """
|
||||
|
||||
|
||||
def check_trusted_projects(apiurl, projects):
|
||||
trusted = config['api_host_options'][apiurl]['trusted_prj']
|
||||
tlen = len(trusted)
|
||||
@ -548,7 +553,7 @@ def check_trusted_projects(apiurl, projects):
|
||||
if not prj in trusted:
|
||||
print("\nThe build root needs packages from project '%s'." % prj)
|
||||
print("Note that malicious packages can compromise the build result or even your system.")
|
||||
r = raw_input(trustprompt % { 'project': prj })
|
||||
r = raw_input(trustprompt % {'project': prj})
|
||||
if r == '1':
|
||||
print("adding '%s' to oscrc: ['%s']['trusted_prj']" % (prj, apiurl))
|
||||
trusted.append(prj)
|
||||
@ -560,6 +565,7 @@ def check_trusted_projects(apiurl, projects):
|
||||
config['api_host_options'][apiurl]['trusted_prj'] = trusted
|
||||
conf.config_set_option(apiurl, 'trusted_prj', ' '.join(trusted))
|
||||
|
||||
|
||||
def get_kiwipath_from_buildinfo(bi, prj, repo):
|
||||
# If the project does not have a path defined we need to get the config
|
||||
# via the repositories in the kiwi file. Unfortunately the buildinfo
|
||||
@ -575,6 +581,7 @@ def get_kiwipath_from_buildinfo(bi, prj, repo):
|
||||
kiwipath.insert(0, myprp)
|
||||
return kiwipath
|
||||
|
||||
|
||||
def calculate_prj_pac(opts, descr):
|
||||
project = opts.alternative_project or store_read_project('.')
|
||||
if opts.local_package:
|
||||
@ -583,16 +590,19 @@ def calculate_prj_pac(opts, descr):
|
||||
package = store_read_package('.')
|
||||
return project, package
|
||||
|
||||
|
||||
def calculate_build_root(apihost, prj, pac, repo, arch):
|
||||
buildroot = os.environ.get('OSC_BUILD_ROOT', config['build-root']) \
|
||||
% {'repo': repo, 'arch': arch, 'project': prj, 'package': pac, 'apihost': apihost}
|
||||
% {'repo': repo, 'arch': arch, 'project': prj, 'package': pac, 'apihost': apihost}
|
||||
return buildroot
|
||||
|
||||
|
||||
def build_as_user():
|
||||
if os.environ.get('OSC_SU_WRAPPER', config['su-wrapper']).split():
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def su_wrapper(cmd):
|
||||
sucmd = os.environ.get('OSC_SU_WRAPPER', config['su-wrapper']).split()
|
||||
if sucmd:
|
||||
@ -604,6 +614,7 @@ def su_wrapper(cmd):
|
||||
cmd = sucmd + cmd
|
||||
return cmd
|
||||
|
||||
|
||||
def run_build(opts, *args):
|
||||
cmd = [config['build-cmd']]
|
||||
cmd += args
|
||||
@ -614,6 +625,7 @@ def run_build(opts, *args):
|
||||
cmd.append('--norootforbuild')
|
||||
return run_external(cmd[0], *cmd[1:])
|
||||
|
||||
|
||||
def main(apiurl, opts, argv):
|
||||
|
||||
repo = argv[0]
|
||||
@ -760,7 +772,8 @@ def main(apiurl, opts, argv):
|
||||
for var in ['OSC_PACKAGECACHEDIR', 'OSC_SU_WRAPPER', 'OSC_BUILD_ROOT']:
|
||||
val = os.getenv(var)
|
||||
if val:
|
||||
if var.startswith('OSC_'): var = var[4:]
|
||||
if var.startswith('OSC_'):
|
||||
var = var[4:]
|
||||
var = var.lower().replace('_', '-')
|
||||
if var in config:
|
||||
print('Overriding config value for %s=\'%s\' with \'%s\'' % (var, config[var], val))
|
||||
@ -783,7 +796,7 @@ def main(apiurl, opts, argv):
|
||||
build_root = config['api_host_options'][apiurl].get('build-root', build_root)
|
||||
try:
|
||||
build_root = build_root % {'repo': repo, 'arch': arch,
|
||||
'project': prj, 'package': pacname, 'apihost': apihost}
|
||||
'project': prj, 'package': pacname, 'apihost': apihost}
|
||||
except:
|
||||
pass
|
||||
|
||||
@ -919,12 +932,12 @@ def main(apiurl, opts, argv):
|
||||
myrsyncdest = os.path.expandvars(opts.rsyncdest)
|
||||
if not os.path.isabs(myrsyncdest):
|
||||
raise oscerr.WrongOptions('--rsync-dest %s is no absolute path (starting with \'/\')!' % opts.rsyncdest)
|
||||
specialcmdopts = ['--rsync-src='+myrsyncsrc, '--rsync-dest='+myrsyncdest]
|
||||
specialcmdopts = ['--rsync-src=' + myrsyncsrc, '--rsync-dest=' + myrsyncdest]
|
||||
if opts.overlay:
|
||||
myoverlay = os.path.abspath(os.path.expanduser(os.path.expandvars(opts.overlay)))
|
||||
if not os.path.isdir(myoverlay):
|
||||
raise oscerr.WrongOptions('--overlay %s is no valid directory!' % opts.overlay)
|
||||
specialcmdopts += ['--overlay='+myoverlay]
|
||||
specialcmdopts += ['--overlay=' + myoverlay]
|
||||
|
||||
try:
|
||||
if opts.noinit:
|
||||
@ -954,12 +967,12 @@ def main(apiurl, opts, argv):
|
||||
|
||||
print('Getting buildinfo from server and store to %s' % bi_filename)
|
||||
bi_text = decode_it(get_buildinfo(apiurl,
|
||||
prj,
|
||||
pac,
|
||||
repo,
|
||||
arch,
|
||||
specfile=build_descr_data,
|
||||
addlist=extra_pkgs))
|
||||
prj,
|
||||
pac,
|
||||
repo,
|
||||
arch,
|
||||
specfile=build_descr_data,
|
||||
addlist=extra_pkgs))
|
||||
if not bi_file:
|
||||
bi_file = open(bi_filename, 'w')
|
||||
# maybe we should check for errors before saving the file
|
||||
@ -982,19 +995,19 @@ def main(apiurl, opts, argv):
|
||||
try:
|
||||
# take care, not to run into double trouble.
|
||||
pkg_meta_e = meta_exists(metatype='pkg', path_args=(quote_plus(prj),
|
||||
quote_plus(pac)), template_args=None, create_new=False,
|
||||
apiurl=apiurl)
|
||||
quote_plus(pac)), template_args=None, create_new=False,
|
||||
apiurl=apiurl)
|
||||
except:
|
||||
pass
|
||||
|
||||
if pkg_meta_e:
|
||||
print('ERROR: Either wrong repo/arch as parameter or a parse error of .spec/.dsc/.kiwi file due to syntax error', file=sys.stderr)
|
||||
else:
|
||||
print('The package \'%s\' does not exist - please ' \
|
||||
'rerun with \'--local-package\'' % pac, file=sys.stderr)
|
||||
print('The package \'%s\' does not exist - please '
|
||||
'rerun with \'--local-package\'' % pac, file=sys.stderr)
|
||||
else:
|
||||
print('The project \'%s\' does not exist - please ' \
|
||||
'rerun with \'--alternative-project <alternative_project>\'' % prj, file=sys.stderr)
|
||||
print('The project \'%s\' does not exist - please '
|
||||
'rerun with \'--alternative-project <alternative_project>\'' % prj, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
else:
|
||||
raise
|
||||
@ -1060,7 +1073,7 @@ def main(apiurl, opts, argv):
|
||||
if 'urllist' in config:
|
||||
if isinstance(config['urllist'], str):
|
||||
re_clist = re.compile('[, ]+')
|
||||
urllist = [ i.strip() for i in re_clist.split(config['urllist'].strip()) ]
|
||||
urllist = [i.strip() for i in re_clist.split(config['urllist'].strip())]
|
||||
else:
|
||||
urllist = config['urllist']
|
||||
|
||||
@ -1070,20 +1083,20 @@ def main(apiurl, opts, argv):
|
||||
if bi.downloadurl:
|
||||
urllist.append(bi.downloadurl.replace('%', '%%') + '/%(extproject)s/%(extrepository)s/%(arch)s/%(filename)s')
|
||||
if opts.disable_cpio_bulk_download:
|
||||
urllist.append( '%(apiurl)s/build/%(project)s/%(repository)s/%(repoarch)s/%(repopackage)s/%(repofilename)s' )
|
||||
urllist.append('%(apiurl)s/build/%(project)s/%(repository)s/%(repoarch)s/%(repopackage)s/%(repofilename)s')
|
||||
|
||||
fetcher = Fetcher(cache_dir,
|
||||
urllist = urllist,
|
||||
offline = opts.noinit or opts.offline,
|
||||
http_debug = config['http_debug'],
|
||||
modules = bi.modules,
|
||||
urllist=urllist,
|
||||
offline=opts.noinit or opts.offline,
|
||||
http_debug=config['http_debug'],
|
||||
modules=bi.modules,
|
||||
enable_cpio=not opts.disable_cpio_bulk_download and bi.enable_cpio,
|
||||
cookiejar=connection.CookieJarAuthHandler(apiurl, os.path.expanduser(conf.config["cookiejar"]))._cookiejar,
|
||||
download_api_only=opts.download_api_only)
|
||||
|
||||
if not opts.trust_all_projects:
|
||||
# implicitly trust the project we are building for
|
||||
check_trusted_projects(apiurl, [ i for i in bi.projects.keys() if not i == prj ])
|
||||
check_trusted_projects(apiurl, [i for i in bi.projects.keys() if not i == prj])
|
||||
|
||||
imagefile = ''
|
||||
imagesource = ''
|
||||
@ -1115,7 +1128,7 @@ def main(apiurl, opts, argv):
|
||||
if opts.oldpackages:
|
||||
old_pkg_dir = opts.oldpackages
|
||||
if not old_pkg_dir.startswith('/') and not opts.offline:
|
||||
data = [ prj, pacname, repo, arch]
|
||||
data = [prj, pacname, repo, arch]
|
||||
if old_pkg_dir == '_link':
|
||||
p = core.findpacs(os.curdir)[0]
|
||||
if not p.islink():
|
||||
@ -1143,15 +1156,20 @@ def main(apiurl, opts, argv):
|
||||
if binaries:
|
||||
class mytmpdir:
|
||||
""" temporary directory that removes itself"""
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.name = mkdtemp(*args, **kwargs)
|
||||
_rmtree = staticmethod(shutil.rmtree)
|
||||
|
||||
def cleanup(self):
|
||||
self._rmtree(self.name)
|
||||
|
||||
def __del__(self):
|
||||
self.cleanup()
|
||||
|
||||
def __exit__(self):
|
||||
self.cleanup()
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
@ -1169,10 +1187,10 @@ def main(apiurl, opts, argv):
|
||||
data[0],
|
||||
data[2], data[3],
|
||||
i.name,
|
||||
package = data[1],
|
||||
target_filename = fname,
|
||||
target_mtime = i.mtime,
|
||||
progress_meter = True)
|
||||
package=data[1],
|
||||
target_filename=fname,
|
||||
target_mtime=i.mtime,
|
||||
progress_meter=True)
|
||||
|
||||
if old_pkg_dir is not None:
|
||||
buildargs.append('--oldpackages=%s' % old_pkg_dir)
|
||||
@ -1202,22 +1220,22 @@ def main(apiurl, opts, argv):
|
||||
filename = sffn.split("/")[-1]
|
||||
# project/repo
|
||||
if i.name.startswith("container:"):
|
||||
prdir = "containers/"+pdir+"/"+rdir
|
||||
prdir = "containers/" + pdir + "/" + rdir
|
||||
pradir = prdir
|
||||
filename = filename[10:]
|
||||
if build_type == 'kiwi':
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('--set-container-derived-from=dir://./' + prdir + "/" + filename)
|
||||
else:
|
||||
prdir = "repos/"+pdir+"/"+rdir
|
||||
prdir = "repos/" + pdir + "/" + rdir
|
||||
# project/repo/arch
|
||||
pradir = prdir+"/"+adir
|
||||
pradir = prdir + "/" + adir
|
||||
# target fullfilename
|
||||
tffn = pradir+"/"+filename
|
||||
tffn = pradir + "/" + filename
|
||||
if not os.path.exists(os.path.join(pradir)):
|
||||
os.makedirs(os.path.join(pradir))
|
||||
if not os.path.exists(tffn):
|
||||
print("Using package: "+sffn)
|
||||
print("Using package: " + sffn)
|
||||
if opts.linksources:
|
||||
os.link(sffn, tffn)
|
||||
else:
|
||||
@ -1276,19 +1294,19 @@ def main(apiurl, opts, argv):
|
||||
for xml in root.findall('repository'):
|
||||
if xml.find('source').get('path') == 'obsrepositories:/':
|
||||
for path in bi.pathes:
|
||||
if not os.path.isdir("repos/"+path):
|
||||
if not os.path.isdir("repos/" + path):
|
||||
continue
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('--add-repo')
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append("dir://./repos/"+path)
|
||||
buildargs.append("dir://./repos/" + path)
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('--add-repotype')
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('rpm-md')
|
||||
if xml.get('priority'):
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('--add-repoprio='+xml.get('priority'))
|
||||
buildargs.append('--add-repoprio=' + xml.get('priority'))
|
||||
else:
|
||||
m = re.match(r"obs://[^/]+/([^/]+)/(\S+)", xml.find('source').get('path'))
|
||||
if not m:
|
||||
@ -1299,14 +1317,14 @@ def main(apiurl, opts, argv):
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('--add-repo')
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append("dir://./repos/"+project+"/"+repo)
|
||||
buildargs.append("dir://./repos/" + project + "/" + repo)
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('--add-repotype')
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('rpm-md')
|
||||
if xml.get('priority'):
|
||||
buildargs.append('--kiwi-parameter')
|
||||
buildargs.append('--add-repopriority='+xml.get('priority'))
|
||||
buildargs.append('--add-repopriority=' + xml.get('priority'))
|
||||
|
||||
if vm_type == "xen" or vm_type == "kvm" or vm_type == "lxc" or vm_type == "nspawn":
|
||||
print('Skipping verification of package signatures due to secure VM build')
|
||||
@ -1353,7 +1371,7 @@ def main(apiurl, opts, argv):
|
||||
rpmlist.append('%s %s\n' % (dep.name, dep.fullfilename))
|
||||
for i in imagebins:
|
||||
rpmlist.append('%s preinstallimage\n' % i)
|
||||
rpmlist += [ '%s %s\n' % (i[0], i[1]) for i in rpmlist_prefers ]
|
||||
rpmlist += ['%s %s\n' % (i[0], i[1]) for i in rpmlist_prefers]
|
||||
|
||||
if imagefile:
|
||||
rpmlist.append('preinstallimage: %s\n' % imagefile)
|
||||
@ -1392,50 +1410,49 @@ def main(apiurl, opts, argv):
|
||||
else:
|
||||
my_build_swap = build_root + '/swap'
|
||||
|
||||
vm_options = [ '--vm-type=%s' % vm_type ]
|
||||
vm_options = ['--vm-type=%s' % vm_type]
|
||||
if vm_telnet:
|
||||
vm_options += [ '--vm-telnet=' + vm_telnet ]
|
||||
vm_options += ['--vm-telnet=' + vm_telnet]
|
||||
if vm_memory:
|
||||
vm_options += [ '--memory=' + vm_memory ]
|
||||
vm_options += ['--memory=' + vm_memory]
|
||||
if vm_type != 'lxc' and vm_type != 'nspawn':
|
||||
vm_options += [ '--vm-disk=' + my_build_device ]
|
||||
vm_options += [ '--vm-swap=' + my_build_swap ]
|
||||
vm_options += [ '--logfile=%s/.build.log' % build_root ]
|
||||
vm_options += ['--vm-disk=' + my_build_device]
|
||||
vm_options += ['--vm-swap=' + my_build_swap]
|
||||
vm_options += ['--logfile=%s/.build.log' % build_root]
|
||||
if vm_type == 'kvm':
|
||||
if config['build-kernel']:
|
||||
vm_options += [ '--vm-kernel=' + config['build-kernel'] ]
|
||||
vm_options += ['--vm-kernel=' + config['build-kernel']]
|
||||
if config['build-initrd']:
|
||||
vm_options += [ '--vm-initrd=' + config['build-initrd'] ]
|
||||
vm_options += ['--vm-initrd=' + config['build-initrd']]
|
||||
|
||||
build_root += '/.mount'
|
||||
if vm_disk_size:
|
||||
vm_options += [ '--vmdisk-rootsize=' + vm_disk_size ]
|
||||
vm_options += ['--vmdisk-rootsize=' + vm_disk_size]
|
||||
|
||||
if config['build-vmdisk-swapsize']:
|
||||
vm_options += [ '--vmdisk-swapsize=' + config['build-vmdisk-swapsize'] ]
|
||||
vm_options += ['--vmdisk-swapsize=' + config['build-vmdisk-swapsize']]
|
||||
if config['build-vmdisk-filesystem']:
|
||||
vm_options += [ '--vmdisk-filesystem=' + config['build-vmdisk-filesystem'] ]
|
||||
vm_options += ['--vmdisk-filesystem=' + config['build-vmdisk-filesystem']]
|
||||
if config['build-vm-user']:
|
||||
vm_options += [ '--vm-user=' + config['build-vm-user'] ]
|
||||
|
||||
vm_options += ['--vm-user=' + config['build-vm-user']]
|
||||
|
||||
if opts.preload:
|
||||
print("Preload done for selected repo/arch.")
|
||||
sys.exit(0)
|
||||
|
||||
print('Running build')
|
||||
cmd = [ config['build-cmd'], '--root='+build_root,
|
||||
'--rpmlist='+rpmlist_filename,
|
||||
'--dist='+bc_filename,
|
||||
'--arch='+bi.buildarch ]
|
||||
cmd = [config['build-cmd'], '--root=' + build_root,
|
||||
'--rpmlist=' + rpmlist_filename,
|
||||
'--dist=' + bc_filename,
|
||||
'--arch=' + bi.buildarch]
|
||||
cmd += specialcmdopts + vm_options + buildargs
|
||||
cmd += [ build_descr ]
|
||||
cmd += [build_descr]
|
||||
|
||||
cmd = su_wrapper(cmd)
|
||||
|
||||
# change personality, if needed
|
||||
if hostarch != bi.buildarch and bi.buildarch in change_personality:
|
||||
cmd = [ change_personality[bi.buildarch] ] + cmd
|
||||
cmd = [change_personality[bi.buildarch]] + cmd
|
||||
|
||||
# record our settings for later builds
|
||||
if is_package_dir(os.curdir):
|
||||
@ -1462,7 +1479,8 @@ def main(apiurl, opts, argv):
|
||||
(s_built, b_built) = get_built_files(pacdir, bi.buildtype)
|
||||
|
||||
print()
|
||||
if s_built: print(decode_it(s_built))
|
||||
if s_built:
|
||||
print(decode_it(s_built))
|
||||
print()
|
||||
print(decode_it(b_built))
|
||||
|
||||
|
||||
@ -11,8 +11,10 @@ class KeyError(Exception):
|
||||
super().__init__()
|
||||
self.args = args
|
||||
self.key = key
|
||||
|
||||
def __str__(self):
|
||||
return ''+self.key+' :'+' '.join(self.args)
|
||||
return '' + self.key + ' :' + ' '.join(self.args)
|
||||
|
||||
|
||||
class Checker:
|
||||
def __init__(self):
|
||||
@ -23,7 +25,7 @@ class Checker:
|
||||
self.ts.initDB()
|
||||
self.ts.openDB()
|
||||
self.ts.setVSFlags(0)
|
||||
#self.ts.Debug(1)
|
||||
# self.ts.Debug(1)
|
||||
|
||||
def readkeys(self, keys=None):
|
||||
keys = keys or []
|
||||
@ -101,6 +103,7 @@ class Checker:
|
||||
if fd is not None:
|
||||
os.close(fd)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
keyfiles = []
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
29
osc/conf.py
29
osc/conf.py
@ -82,6 +82,7 @@ def _identify_osccookiejar():
|
||||
|
||||
return os.path.join(osc_state_dir, 'cookiejar')
|
||||
|
||||
|
||||
DEFAULTS = {'apiurl': 'https://api.opensuse.org',
|
||||
'user': None,
|
||||
'pass': None,
|
||||
@ -105,7 +106,7 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org',
|
||||
'build-vm-user': '', # optional for VM builds
|
||||
'build-kernel': '', # optional for VM builds
|
||||
'build-initrd': '', # optional for VM builds
|
||||
'download-assets-cmd': '/usr/lib/build/download_assets', # optional for scm/git based builds
|
||||
'download-assets-cmd': '/usr/lib/build/download_assets', # optional for scm/git based builds
|
||||
|
||||
'build-jobs': str(_get_processors()),
|
||||
'builtin_signature_check': '1', # by default use builtin check for verify pkgs
|
||||
@ -177,7 +178,7 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org',
|
||||
|
||||
# heuristic to speedup Package.status
|
||||
'status_mtime_heuristic': '0'
|
||||
}
|
||||
}
|
||||
|
||||
# some distros like Debian rename and move build to obs-build
|
||||
if not os.path.isfile('/usr/bin/build') and os.path.isfile('/usr/bin/obs-build'):
|
||||
@ -186,14 +187,14 @@ if not os.path.isfile('/usr/lib/build/vc') and os.path.isfile('/usr/lib/obs-buil
|
||||
DEFAULTS['vc-cmd'] = '/usr/lib/obs-build/vc'
|
||||
|
||||
boolean_opts = ['debug', 'do_package_tracking', 'http_debug', 'post_mortem', 'traceback', 'check_filelist',
|
||||
'checkout_no_colon', 'checkout_rooted', 'check_for_request_on_action', 'linkcontrol', 'show_download_progress', 'request_show_interactive',
|
||||
'request_show_source_buildstatus', 'review_inherit_group', 'use_keyring', 'no_verify', 'builtin_signature_check',
|
||||
'http_full_debug', 'include_request_from_project', 'local_service_run', 'buildlog_strip_time', 'no_preinstallimage',
|
||||
'status_mtime_heuristic', 'print_web_links', 'ccache', 'sccache', 'build-shell-after-fail']
|
||||
'checkout_no_colon', 'checkout_rooted', 'check_for_request_on_action', 'linkcontrol', 'show_download_progress', 'request_show_interactive',
|
||||
'request_show_source_buildstatus', 'review_inherit_group', 'use_keyring', 'no_verify', 'builtin_signature_check',
|
||||
'http_full_debug', 'include_request_from_project', 'local_service_run', 'buildlog_strip_time', 'no_preinstallimage',
|
||||
'status_mtime_heuristic', 'print_web_links', 'ccache', 'sccache', 'build-shell-after-fail']
|
||||
integer_opts = ['build-jobs']
|
||||
|
||||
api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'realname', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj',
|
||||
'downloadurl', 'sshkey']
|
||||
'downloadurl', 'sshkey']
|
||||
|
||||
|
||||
def apply_option_types(config, conffile=""):
|
||||
@ -492,8 +493,8 @@ def get_apiurl_usr(apiurl):
|
||||
try:
|
||||
return get_apiurl_api_host_options(apiurl)['user']
|
||||
except KeyError:
|
||||
print('no specific section found in config file for host of [\'%s\'] - using default user: \'%s\'' \
|
||||
% (apiurl, config['user']), file=sys.stderr)
|
||||
print('no specific section found in config file for host of [\'%s\'] - using default user: \'%s\''
|
||||
% (apiurl, config['user']), file=sys.stderr)
|
||||
return config['user']
|
||||
|
||||
|
||||
@ -634,6 +635,7 @@ def config_set_option(section, opt, val=None, delete=False, update=True, creds_m
|
||||
return (opt, cp.get(section, opt, raw=True))
|
||||
return (opt, None)
|
||||
|
||||
|
||||
def _extract_user_compat(cp, section, creds_mgr):
|
||||
"""
|
||||
This extracts the user either from the ConfigParser or
|
||||
@ -644,6 +646,7 @@ def _extract_user_compat(cp, section, creds_mgr):
|
||||
user = creds_mgr.get_user(section)
|
||||
return user
|
||||
|
||||
|
||||
def write_initial_config(conffile, entries, custom_template='', creds_mgr_descriptor=None):
|
||||
"""
|
||||
write osc's intial configuration file. entries is a dict which contains values
|
||||
@ -731,7 +734,7 @@ def get_config(override_conffile=None,
|
||||
|
||||
conffile = os.path.expanduser(conffile)
|
||||
if not os.path.exists(conffile):
|
||||
raise oscerr.NoConfigfile(conffile, \
|
||||
raise oscerr.NoConfigfile(conffile,
|
||||
account_not_configured_text % conffile)
|
||||
|
||||
# okay, we made sure that oscrc exists
|
||||
@ -867,8 +870,8 @@ def get_config(override_conffile=None,
|
||||
scheme = config.get('scheme', 'https')
|
||||
config['apiurl'] = urljoin(scheme, apisrv)
|
||||
if 'apisrc' in config or 'scheme' in config:
|
||||
print('Warning: Use of the \'scheme\' or \'apisrv\' in oscrc is deprecated!\n' \
|
||||
'Warning: See README for migration details.', file=sys.stderr)
|
||||
print('Warning: Use of the \'scheme\' or \'apisrv\' in oscrc is deprecated!\n'
|
||||
'Warning: See README for migration details.', file=sys.stderr)
|
||||
if 'build_platform' in config:
|
||||
print('Warning: Use of \'build_platform\' config option is deprecated! (use \'build_repository\' instead)', file=sys.stderr)
|
||||
config['build_repository'] = config['build_platform']
|
||||
@ -932,6 +935,7 @@ def identify_conf():
|
||||
|
||||
return conffile
|
||||
|
||||
|
||||
def interactive_config_setup(conffile, apiurl, initial=True):
|
||||
scheme = urlsplit(apiurl)[0]
|
||||
http = scheme == "http"
|
||||
@ -958,6 +962,7 @@ def interactive_config_setup(conffile, apiurl, initial=True):
|
||||
else:
|
||||
add_section(conffile, apiurl, user, passwd, creds_mgr_descriptor=creds_mgr_descr, allow_http=http)
|
||||
|
||||
|
||||
def select_credentials_manager_descr():
|
||||
if not credentials.has_keyring_support():
|
||||
print('To use keyrings please install python%d-keyring.' % sys.version_info.major)
|
||||
|
||||
802
osc/core.py
802
osc/core.py
File diff suppressed because it is too large
Load Diff
@ -138,7 +138,7 @@ class Fetcher:
|
||||
with tempfile.NamedTemporaryFile(prefix='osc_build',
|
||||
delete=False) as tmpfile:
|
||||
mg_stat = mg.urlgrab(pac.filename, filename=tmpfile.name,
|
||||
text='%s(%s) %s' % (prefix, pac.project, pac.filename))
|
||||
text='%s(%s) %s' % (prefix, pac.project, pac.filename))
|
||||
if mg_stat:
|
||||
self.move_package(tmpfile.name, pac.localdir, pac)
|
||||
|
||||
@ -260,7 +260,7 @@ class Fetcher:
|
||||
hdrmd5 = packagequery.PackageQuery.queryhdrmd5(i.fullfilename)
|
||||
if not hdrmd5 or hdrmd5 != i.hdrmd5:
|
||||
print('%s/%s: attempting download from api, since the hdrmd5 did not match - %s != %s'
|
||||
% (i.project, i.name, hdrmd5, i.hdrmd5))
|
||||
% (i.project, i.name, hdrmd5, i.hdrmd5))
|
||||
os.unlink(i.fullfilename)
|
||||
self.__add_cpio(i)
|
||||
|
||||
@ -374,7 +374,7 @@ def verify_pacs_old(pac_list):
|
||||
|
||||
- You may use --no-verify to skip the verification (which is a risk for your system).
|
||||
""" % {'name': missing_key,
|
||||
'dir': os.path.expanduser('~')}, file=sys.stderr)
|
||||
'dir': os.path.expanduser('~')}, file=sys.stderr)
|
||||
|
||||
else:
|
||||
print("""
|
||||
|
||||
@ -62,6 +62,7 @@ def create_text_meter(*args, **kwargs):
|
||||
return TextMeter(*args, **kwargs)
|
||||
return None
|
||||
|
||||
|
||||
if have_pb_module:
|
||||
TextMeter = PBTextMeter
|
||||
else:
|
||||
|
||||
@ -4,19 +4,22 @@
|
||||
# either version 2, or (at your option) any later version.
|
||||
|
||||
|
||||
|
||||
class OscBaseError(Exception):
|
||||
def __init__(self, args=()):
|
||||
super().__init__()
|
||||
self.args = args
|
||||
|
||||
def __str__(self):
|
||||
return ''.join(self.args)
|
||||
|
||||
|
||||
class UserAbort(OscBaseError):
|
||||
"""Exception raised when the user requested abortion"""
|
||||
|
||||
|
||||
class ConfigError(OscBaseError):
|
||||
"""Exception raised when there is an error in the config file"""
|
||||
|
||||
def __init__(self, msg, fname):
|
||||
super().__init__()
|
||||
self.msg = msg
|
||||
@ -25,25 +28,32 @@ class ConfigError(OscBaseError):
|
||||
def __str__(self):
|
||||
return f"Error in config file {self.file}\n {self.msg}"
|
||||
|
||||
|
||||
class ConfigMissingApiurl(ConfigError):
|
||||
"""Exception raised when a apiurl does not exist in the config file"""
|
||||
|
||||
def __init__(self, msg, fname, url):
|
||||
super().__init__(msg, fname)
|
||||
self.url = url
|
||||
|
||||
|
||||
class ConfigMissingCredentialsError(ConfigError):
|
||||
def __init__(self, msg, fname, url):
|
||||
super().__init__(msg, fname)
|
||||
self.url = url
|
||||
|
||||
|
||||
class APIError(OscBaseError):
|
||||
"""Exception raised when there is an error in the output from the API"""
|
||||
|
||||
def __init__(self, msg):
|
||||
super().__init__()
|
||||
self.msg = msg
|
||||
|
||||
|
||||
class NoConfigfile(OscBaseError):
|
||||
"""Exception raised when osc's configfile cannot be found"""
|
||||
|
||||
def __init__(self, fname, msg):
|
||||
super().__init__()
|
||||
self.file = fname
|
||||
@ -52,69 +62,87 @@ class NoConfigfile(OscBaseError):
|
||||
def __str__(self):
|
||||
return f"Config file cannot be found: {self.file}\n {self.msg}"
|
||||
|
||||
|
||||
class ExtRuntimeError(OscBaseError):
|
||||
"""Exception raised when there is a runtime error of an external tool"""
|
||||
|
||||
def __init__(self, msg, fname):
|
||||
super().__init__()
|
||||
self.msg = msg
|
||||
self.file = fname
|
||||
|
||||
|
||||
class ServiceRuntimeError(OscBaseError):
|
||||
"""Exception raised when the execution of a source service failed"""
|
||||
|
||||
def __init__(self, msg):
|
||||
super().__init__()
|
||||
self.msg = msg
|
||||
|
||||
|
||||
class WrongArgs(OscBaseError):
|
||||
"""Exception raised by the cli for wrong arguments usage"""
|
||||
|
||||
|
||||
class WrongOptions(OscBaseError):
|
||||
"""Exception raised by the cli for wrong option usage"""
|
||||
#def __str__(self):
|
||||
# def __str__(self):
|
||||
# s = 'Sorry, wrong options.'
|
||||
# if self.args:
|
||||
# s += '\n' + self.args
|
||||
# return s
|
||||
|
||||
|
||||
class NoWorkingCopy(OscBaseError):
|
||||
"""Exception raised when directory is neither a project dir nor a package dir"""
|
||||
|
||||
|
||||
class NotMissing(OscBaseError):
|
||||
"""Exception raised when link target should not exist, but it does"""
|
||||
|
||||
|
||||
class WorkingCopyWrongVersion(OscBaseError):
|
||||
"""Exception raised when working copy's .osc/_osclib_version doesn't match"""
|
||||
|
||||
|
||||
class WorkingCopyOutdated(OscBaseError):
|
||||
"""Exception raised when the working copy is outdated.
|
||||
It takes a tuple with three arguments: path to wc,
|
||||
revision that it has, revision that it should have.
|
||||
"""
|
||||
|
||||
def __str__(self):
|
||||
return ('Working copy \'%s\' is out of date (rev %s vs rev %s).\n'
|
||||
'Looks as if you need to update it first.' \
|
||||
% (self.args[0], self.args[1], self.args[2]))
|
||||
'Looks as if you need to update it first.'
|
||||
% (self.args[0], self.args[1], self.args[2]))
|
||||
|
||||
|
||||
class PackageError(OscBaseError):
|
||||
"""Base class for all Package related exceptions"""
|
||||
|
||||
def __init__(self, prj, pac):
|
||||
super().__init__()
|
||||
self.prj = prj
|
||||
self.pac = pac
|
||||
|
||||
|
||||
class WorkingCopyInconsistent(PackageError):
|
||||
"""Exception raised when the working copy is in an inconsistent state"""
|
||||
|
||||
def __init__(self, prj, pac, dirty_files, msg):
|
||||
super().__init__(prj, pac)
|
||||
self.dirty_files = dirty_files
|
||||
self.msg = msg
|
||||
|
||||
|
||||
class LinkExpandError(PackageError):
|
||||
"""Exception raised when source link expansion fails"""
|
||||
|
||||
def __init__(self, prj, pac, msg):
|
||||
super().__init__(prj, pac)
|
||||
self.msg = msg
|
||||
|
||||
|
||||
class OscIOError(OscBaseError):
|
||||
def __init__(self, e, msg):
|
||||
super().__init__()
|
||||
@ -133,6 +161,7 @@ class OscInvalidRevision(OscValueError):
|
||||
"""
|
||||
Invalid revision value.
|
||||
"""
|
||||
|
||||
def __str__(self):
|
||||
return "Invalid revision value: {}".format("".join(self.args))
|
||||
|
||||
@ -141,41 +170,50 @@ class PackageNotInstalled(OscBaseError):
|
||||
"""
|
||||
Exception raised when a package is not installed on local system
|
||||
"""
|
||||
|
||||
def __init__(self, pkg):
|
||||
super().__init__((pkg,))
|
||||
|
||||
def __str__(self):
|
||||
return 'Package %s is required for this operation' % self.args
|
||||
|
||||
|
||||
class SignalInterrupt(Exception):
|
||||
"""Exception raised on SIGTERM and SIGHUP."""
|
||||
|
||||
|
||||
class PackageExists(PackageError):
|
||||
"""
|
||||
Exception raised when a local object already exists
|
||||
"""
|
||||
|
||||
def __init__(self, prj, pac, msg):
|
||||
super().__init__(prj, pac)
|
||||
self.msg = msg
|
||||
|
||||
|
||||
class PackageMissing(PackageError):
|
||||
"""
|
||||
Exception raised when a local object doesn't exist
|
||||
"""
|
||||
|
||||
def __init__(self, prj, pac, msg):
|
||||
super().__init__(prj, pac)
|
||||
self.msg = msg
|
||||
|
||||
|
||||
class PackageFileConflict(PackageError):
|
||||
"""
|
||||
Exception raised when there's a file conflict.
|
||||
Conflict doesn't mean an unsuccessfull merge in this context.
|
||||
"""
|
||||
|
||||
def __init__(self, prj, pac, file, msg):
|
||||
super().__init__(prj, pac)
|
||||
self.file = file
|
||||
self.msg = msg
|
||||
|
||||
|
||||
class PackageInternalError(PackageError):
|
||||
def __init__(self, prj, pac, msg):
|
||||
super().__init__(prj, pac)
|
||||
|
||||
@ -32,8 +32,8 @@ def urlcompare(url, *args):
|
||||
query_args2 = parse_qs(components2.query)
|
||||
components2 = components2._replace(query=None)
|
||||
|
||||
if components != components2 or \
|
||||
query_args != query_args2:
|
||||
if components != components2 or \
|
||||
query_args != query_args2:
|
||||
return False
|
||||
|
||||
return True
|
||||
@ -64,6 +64,7 @@ def xml_equal(actual, exp):
|
||||
|
||||
class RequestWrongOrder(Exception):
|
||||
"""raised if an unexpected request is issued to urllib2"""
|
||||
|
||||
def __init__(self, url, exp_url, method, exp_method):
|
||||
super().__init__()
|
||||
self.url = url
|
||||
@ -74,8 +75,10 @@ class RequestWrongOrder(Exception):
|
||||
def __str__(self):
|
||||
return '%s, %s, %s, %s' % (self.url, self.exp_url, self.method, self.exp_method)
|
||||
|
||||
|
||||
class RequestDataMismatch(Exception):
|
||||
"""raised if POSTed or PUTed data doesn't match with the expected data"""
|
||||
|
||||
def __init__(self, url, got, exp):
|
||||
self.url = url
|
||||
self.got = got
|
||||
@ -91,7 +94,7 @@ EXPECTED_REQUESTS = []
|
||||
# HACK: Fix "ValueError: I/O operation on closed file." error in tests on openSUSE Leap 15.2.
|
||||
# The problem seems to appear only in the tests, possibly some interaction with MockHTTPConnectionPool.
|
||||
# Porting 753fbc03 to urllib3 in openSUSE Leap 15.2 would fix the problem.
|
||||
urllib3.response.HTTPResponse.__iter__ = lambda self : iter(self._fp)
|
||||
urllib3.response.HTTPResponse.__iter__ = lambda self: iter(self._fp)
|
||||
|
||||
|
||||
class MockHTTPConnectionPool:
|
||||
@ -290,7 +293,7 @@ class OscTestCase(unittest.TestCase):
|
||||
self.assertEqual(got, exp)
|
||||
else:
|
||||
start_delim = "\n" + (" 8< ".join(["-----"] * 8)) + "\n"
|
||||
end_delim = "\n" + (" >8 ".join(["-----"] * 8)) + "\n\n"
|
||||
end_delim = "\n" + (" >8 ".join(["-----"] * 8)) + "\n\n"
|
||||
self.assertEqual(got, exp,
|
||||
"got:" + start_delim + got + end_delim +
|
||||
"got:" + start_delim + got + end_delim +
|
||||
"expected:" + start_delim + exp + end_delim)
|
||||
|
||||
@ -10,9 +10,11 @@ from .common import OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'addfile_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestAddFiles)
|
||||
|
||||
|
||||
class TestAddFiles(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
@ -83,5 +85,6 @@ class TestAddFiles(OscTestCase):
|
||||
self.assertRaises(osc.oscerr.OscIOError, p.addfile, 'doesnotexist')
|
||||
self.assertFalse(os.path.exists(os.path.join('.osc', '_to_be_added')))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -12,11 +12,14 @@ from .common import GET, PUT, POST, DELETE, OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'commit_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestCommit)
|
||||
|
||||
|
||||
rev_dummy = '<revision rev="repository">\n <srcmd5>empty</srcmd5>\n</revision>'
|
||||
|
||||
|
||||
class TestCommit(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
@ -27,7 +30,7 @@ class TestCommit(OscTestCase):
|
||||
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin&withvalidate=1',
|
||||
file='testSimple_missingfilelist', expfile='testSimple_lfilelist')
|
||||
@PUT('http://localhost/source/osctest/simple/nochange?rev=repository',
|
||||
exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
|
||||
exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
|
||||
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
|
||||
file='testSimple_cfilesremote', expfile='testSimple_lfilelist')
|
||||
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27simple%27+or+action%2Fsource%2F%40package%3D%27simple%27%29', file='testOpenRequests')
|
||||
@ -183,7 +186,7 @@ class TestCommit(OscTestCase):
|
||||
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin&withvalidate=1',
|
||||
file='testSimple_missingfilelist', expfile='testSimple_lfilelist')
|
||||
@PUT('http://localhost/source/osctest/simple/nochange?rev=repository', exp='This file didn\'t change but\nis modified.\n',
|
||||
exception=IOError('test exception'), text=rev_dummy)
|
||||
exception=IOError('test exception'), text=rev_dummy)
|
||||
def test_interrupt(self):
|
||||
"""interrupt a commit"""
|
||||
self._change_to_pkg('simple')
|
||||
@ -307,7 +310,7 @@ class TestCommit(OscTestCase):
|
||||
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin&withvalidate=1',
|
||||
file='testSimple_missingfilelist', expfile='testSimple_lfilelist')
|
||||
@PUT('http://localhost/source/osctest/simple/nochange?rev=repository',
|
||||
exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
|
||||
exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
|
||||
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
|
||||
expfile='testSimple_lfilelist', text='an error occured', code=500)
|
||||
def test_commitfilelist_error(self):
|
||||
@ -328,7 +331,7 @@ class TestCommit(OscTestCase):
|
||||
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
|
||||
file='testSimple_missingfilelistwithSHAsum', expfile='testSimple_lfilelistwithSHA')
|
||||
@PUT('http://localhost/source/osctest/simple/nochange?rev=repository',
|
||||
exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
|
||||
exp='This file didn\'t change but\nis modified.\n', text=rev_dummy)
|
||||
@POST('http://localhost/source/osctest/simple?comment=&cmd=commitfilelist&user=Admin',
|
||||
file='testSimple_cfilesremote', expfile='testSimple_lfilelistwithSHA')
|
||||
@GET('http://localhost/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27osctest%27+or+action%2Fsource%2F%40project%3D%27osctest%27%29+and+%28action%2Ftarget%2F%40package%3D%27simple%27+or+action%2Fsource%2F%40package%3D%27simple%27%29', file='testOpenRequests')
|
||||
@ -368,5 +371,6 @@ class TestCommit(OscTestCase):
|
||||
self._check_status(p, 'add', '!')
|
||||
self._check_status(p, 'bar', ' ')
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -9,9 +9,11 @@ from .common import OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'deletefile_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestDeleteFiles)
|
||||
|
||||
|
||||
class TestDeleteFiles(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
@ -205,5 +207,6 @@ class TestDeleteFiles(OscTestCase):
|
||||
self.assertTrue(ret[0] == exp1)
|
||||
self.assertTrue(ret[1] == exp2)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -11,11 +11,14 @@ from .common import GET, OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'difffile_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestDiffFiles)
|
||||
|
||||
|
||||
class TestDiffFiles(OscTestCase):
|
||||
diff_hdr = 'Index: %s\n==================================================================='
|
||||
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
|
||||
@ -335,5 +338,6 @@ Binary file 'binary' has changed.
|
||||
exp = __canonise_diff(exp)
|
||||
self.assertEqualMultiline(got, exp)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -6,6 +6,7 @@ from osc.util.helper import decode_it, decode_list
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestResults)
|
||||
|
||||
|
||||
class TestResults(unittest.TestCase):
|
||||
def testDecodeList(self):
|
||||
strlist = ['Test1', 'Test2', 'Test3']
|
||||
@ -21,7 +22,6 @@ class TestResults(unittest.TestCase):
|
||||
out = decode_list(byteslist)
|
||||
self.assertListEqual(out, strlist)
|
||||
|
||||
|
||||
def testDecodeIt(self):
|
||||
bytes_obj = b'Test the decoding'
|
||||
string_obj = 'Test the decoding'
|
||||
@ -32,6 +32,6 @@ class TestResults(unittest.TestCase):
|
||||
out = decode_it(string_obj)
|
||||
self.assertEqual(out, string_obj)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
|
||||
@ -9,9 +9,11 @@ from .common import OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'init_package_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestInitPackage)
|
||||
|
||||
|
||||
class TestInitPackage(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
# workaround for git because it doesn't allow empty dirs
|
||||
@ -88,5 +90,6 @@ class TestInitPackage(OscTestCase):
|
||||
f.write('foo\n')
|
||||
self.assertRaises(osc.oscerr.OscIOError, osc.core.Package.init_package, 'http://localhost', 'osctest', 'testpkg', pac_dir)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -10,9 +10,11 @@ from .common import GET, OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'init_project_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestInitProject)
|
||||
|
||||
|
||||
class TestInitProject(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
# workaround for git because it doesn't allow empty dirs
|
||||
@ -70,5 +72,6 @@ class TestInitProject(OscTestCase):
|
||||
self._check_list(os.path.join(storedir, '_apiurl'), 'http://localhost\n')
|
||||
self.assertFalse(os.path.exists(os.path.join(storedir, '_packages')))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -9,9 +9,11 @@ from .common import OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'project_package_status_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestPackageStatus)
|
||||
|
||||
|
||||
class TestPackageStatus(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
@ -21,7 +23,7 @@ class TestPackageStatus(OscTestCase):
|
||||
self._change_to_pkg('simple')
|
||||
p = osc.core.Package('.')
|
||||
exp_st = [('A', 'add'), ('?', 'exists'), ('D', 'foo'), ('!', 'merge'), ('R', 'missing'),
|
||||
('!', 'missing_added'), ('M', 'nochange'), ('S', 'skipped'), (' ', 'test')]
|
||||
('!', 'missing_added'), ('M', 'nochange'), ('S', 'skipped'), (' ', 'test')]
|
||||
st = p.get_status()
|
||||
self.assertEqual(exp_st, st)
|
||||
|
||||
@ -84,5 +86,6 @@ class TestPackageStatus(OscTestCase):
|
||||
st = p.get_status(True)
|
||||
self.assertEqual(exp_st, st)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -12,12 +12,14 @@ from .common import GET, POST, OscTestCase, EXPECTED_REQUESTS
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'prdiff_fixtures')
|
||||
UPSTREAM = 'some:project'
|
||||
BRANCH = 'home:user:branches:' + UPSTREAM
|
||||
BRANCH = 'home:user:branches:' + UPSTREAM
|
||||
|
||||
|
||||
def rdiff_url(pkg, oldprj, newprj):
|
||||
return 'http://localhost/source/%s/%s?unified=1&opackage=%s&oproject=%s&cmd=diff&expand=1&tarlimit=0&filelimit=0' % \
|
||||
(newprj, pkg, pkg, oldprj.replace(':', '%3A'))
|
||||
|
||||
|
||||
def request_url(prj):
|
||||
return 'http://localhost/search/request?match=%%28state%%2F%%40name%%3D%%27new%%27+or+state%%2F%%40name%%3D%%27review%%27%%29+and+%%28action%%2Ftarget%%2F%%40project%%3D%%27%s%%27+or+action%%2Fsource%%2F%%40project%%3D%%27%s%%27%%29' % \
|
||||
tuple([prj.replace(':', '%3A')] * 2)
|
||||
@ -45,8 +47,10 @@ def POST_RDIFF(oldprj, newprj):
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestProjectDiff)
|
||||
|
||||
|
||||
class TestProjectDiff(OscTestCase):
|
||||
diff_hdr = 'Index: %s\n==================================================================='
|
||||
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
|
||||
@ -61,13 +65,11 @@ class TestProjectDiff(OscTestCase):
|
||||
cli.main(argv=argv)
|
||||
return sys.stdout.getvalue()
|
||||
|
||||
|
||||
def testPrdiffTooManyArgs(self):
|
||||
def runner():
|
||||
self._run_prdiff('one', 'two', 'superfluous-arg')
|
||||
self.assertRaises(osc.oscerr.WrongArgs, runner)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES(UPSTREAM, BRANCH)
|
||||
@POST_RDIFF(UPSTREAM, BRANCH)
|
||||
@POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='')
|
||||
@ -77,6 +79,7 @@ differs: common-two
|
||||
identical: common-three
|
||||
identical: only-in-new
|
||||
"""
|
||||
|
||||
def runner():
|
||||
self._run_prdiff()
|
||||
|
||||
@ -90,7 +93,6 @@ identical: only-in-new
|
||||
out = self._run_prdiff()
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES(UPSTREAM, BRANCH)
|
||||
@POST_RDIFF(UPSTREAM, BRANCH)
|
||||
@POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='')
|
||||
@ -104,7 +106,6 @@ identical: only-in-new
|
||||
out = self._run_prdiff('home:user:branches:some:project')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES('old:prj', 'new:prj')
|
||||
@POST_RDIFF('old:prj', 'new:prj')
|
||||
def testPrdiffTwoArgs(self):
|
||||
@ -116,7 +117,6 @@ identical: common-three
|
||||
out = self._run_prdiff('old:prj', 'new:prj')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES('old:prj', 'new:prj')
|
||||
@POST_RDIFF('old:prj', 'new:prj')
|
||||
def testPrdiffOldOnly(self):
|
||||
@ -129,7 +129,6 @@ old only: only-in-old
|
||||
out = self._run_prdiff('--show-not-in-new', 'old:prj', 'new:prj')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES('old:prj', 'new:prj')
|
||||
@POST_RDIFF('old:prj', 'new:prj')
|
||||
def testPrdiffNewOnly(self):
|
||||
@ -142,7 +141,6 @@ new only: only-in-new
|
||||
out = self._run_prdiff('--show-not-in-old', 'old:prj', 'new:prj')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES('old:prj', 'new:prj')
|
||||
@POST_RDIFF('old:prj', 'new:prj')
|
||||
def testPrdiffDiffstat(self):
|
||||
@ -158,7 +156,6 @@ identical: common-three
|
||||
out = self._run_prdiff('--diffstat', 'old:prj', 'new:prj')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES('old:prj', 'new:prj')
|
||||
@POST_RDIFF('old:prj', 'new:prj')
|
||||
def testPrdiffUnified(self):
|
||||
@ -182,9 +179,8 @@ identical: common-three
|
||||
out = self._run_prdiff('--unified', 'old:prj', 'new:prj')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES('old:prj', 'new:prj')
|
||||
@POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-three', 'old:prj', 'new:prj'), exp='', text='')
|
||||
def testPrdiffInclude(self):
|
||||
self._change_to_tmpdir()
|
||||
@ -195,9 +191,8 @@ identical: common-three
|
||||
'old:prj', 'new:prj')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES('old:prj', 'new:prj')
|
||||
@POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-three', 'old:prj', 'new:prj'), exp='', text='')
|
||||
def testPrdiffExclude(self):
|
||||
self._change_to_tmpdir()
|
||||
@ -207,9 +202,8 @@ identical: common-three
|
||||
out = self._run_prdiff('--exclude', 'one', 'old:prj', 'new:prj')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES('old:prj', 'new:prj')
|
||||
@POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-two', 'old:prj', 'new:prj'), exp='', file='common-two-diff')
|
||||
def testPrdiffIncludeExclude(self):
|
||||
self._change_to_tmpdir()
|
||||
exp = """differs: common-two
|
||||
@ -219,13 +213,12 @@ identical: common-three
|
||||
'old:prj', 'new:prj')
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
@GET_PROJECT_PACKAGES(UPSTREAM, BRANCH)
|
||||
@GET(request_url(UPSTREAM), exp='', file='request')
|
||||
@POST(rdiff_url('common-one', UPSTREAM, BRANCH), exp='', text='')
|
||||
@POST(rdiff_url('common-two', UPSTREAM, BRANCH), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-one', UPSTREAM, BRANCH), exp='', text='')
|
||||
@POST(rdiff_url('common-two', UPSTREAM, BRANCH), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-three', UPSTREAM, BRANCH), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='')
|
||||
@POST(rdiff_url('only-in-new', UPSTREAM, BRANCH), exp='', text='')
|
||||
def testPrdiffRequestsMatching(self):
|
||||
self._change_to_tmpdir()
|
||||
exp = """identical: common-one
|
||||
@ -241,14 +234,14 @@ identical: only-in-new
|
||||
out = self._run_prdiff('--requests', UPSTREAM, BRANCH)
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
# Reverse the direction of the diff.
|
||||
|
||||
@GET_PROJECT_PACKAGES(BRANCH, UPSTREAM)
|
||||
@GET(request_url(BRANCH), exp='', file='no-requests')
|
||||
@POST(rdiff_url('common-one', BRANCH, UPSTREAM), exp='', text='')
|
||||
@POST(rdiff_url('common-two', BRANCH, UPSTREAM), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-one', BRANCH, UPSTREAM), exp='', text='')
|
||||
@POST(rdiff_url('common-two', BRANCH, UPSTREAM), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('common-three', BRANCH, UPSTREAM), exp='', file='common-two-diff')
|
||||
@POST(rdiff_url('only-in-new', BRANCH, UPSTREAM), exp='', text='')
|
||||
@POST(rdiff_url('only-in-new', BRANCH, UPSTREAM), exp='', text='')
|
||||
def testPrdiffRequestsSwitched(self):
|
||||
self._change_to_tmpdir()
|
||||
exp = """identical: common-one
|
||||
@ -260,6 +253,5 @@ identical: only-in-new
|
||||
self.assertEqualMultiline(out, exp)
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -9,9 +9,11 @@ from .common import OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'project_package_status_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestProjectStatus)
|
||||
|
||||
|
||||
class TestProjectStatus(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
@ -93,7 +95,7 @@ class TestProjectStatus(OscTestCase):
|
||||
self._change_to_pkg('.')
|
||||
prj = osc.core.Project('.', getPackageList=False)
|
||||
exp_st = [(' ', 'conflict'), (' ', 'simple'), ('A', 'added'), ('D', 'deleted'),
|
||||
('!', 'missing'), ('!', 'added_deleted'), ('D', 'deleted_deleted'), ('?', 'excluded')]
|
||||
('!', 'missing'), ('!', 'added_deleted'), ('D', 'deleted_deleted'), ('?', 'excluded')]
|
||||
st = prj.get_status()
|
||||
self.assertEqual(exp_st, st)
|
||||
|
||||
@ -159,5 +161,6 @@ class TestProjectStatus(OscTestCase):
|
||||
p = prj.get_pacobj('doesnotexist')
|
||||
self.assertTrue(isinstance(p, type(None)))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -12,9 +12,11 @@ from .common import GET, PUT, POST, DELETE, OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'repairwc_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestRepairWC)
|
||||
|
||||
|
||||
class TestRepairWC(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
|
||||
@ -10,9 +10,11 @@ from .common import OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'request_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestRequest)
|
||||
|
||||
|
||||
class TestRequest(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
@ -24,7 +26,7 @@ class TestRequest(OscTestCase):
|
||||
"""create a simple submitrequest"""
|
||||
r = osc.core.Request()
|
||||
r.add_action('submit', src_project='foo', src_package='bar', src_rev='42',
|
||||
tgt_project='foobar', tgt_package='bar')
|
||||
tgt_project='foobar', tgt_package='bar')
|
||||
self.assertEqual(r.actions[0].type, 'submit')
|
||||
self.assertEqual(r.actions[0].src_project, 'foo')
|
||||
self.assertEqual(r.actions[0].src_package, 'bar')
|
||||
@ -49,7 +51,7 @@ class TestRequest(OscTestCase):
|
||||
"""create a simple submitrequest"""
|
||||
r = osc.core.Request()
|
||||
r.add_action('submit', src_project='foo', src_package='bar',
|
||||
tgt_project='foobar', tgt_package='bar', opt_sourceupdate='cleanup', opt_updatelink='1')
|
||||
tgt_project='foobar', tgt_package='bar', opt_sourceupdate='cleanup', opt_updatelink='1')
|
||||
self.assertEqual(r.actions[0].type, 'submit')
|
||||
self.assertEqual(r.actions[0].src_project, 'foo')
|
||||
self.assertEqual(r.actions[0].src_package, 'bar')
|
||||
@ -77,7 +79,7 @@ class TestRequest(OscTestCase):
|
||||
"""create a submitrequest with missing target package"""
|
||||
r = osc.core.Request()
|
||||
r.add_action('submit', src_project='foo', src_package='bar',
|
||||
tgt_project='foobar')
|
||||
tgt_project='foobar')
|
||||
self.assertEqual(r.actions[0].type, 'submit')
|
||||
self.assertEqual(r.actions[0].src_project, 'foo')
|
||||
self.assertEqual(r.actions[0].src_package, 'bar')
|
||||
@ -148,7 +150,7 @@ class TestRequest(OscTestCase):
|
||||
"""create an add_role request (person+group element)"""
|
||||
r = osc.core.Request()
|
||||
r.add_action('add_role', tgt_project='foo', tgt_package='bar', person_name='user', person_role='reader',
|
||||
group_name='group', group_role='reviewer')
|
||||
group_name='group', group_role='reviewer')
|
||||
self.assertEqual(r.actions[0].type, 'add_role')
|
||||
self.assertEqual(r.actions[0].tgt_project, 'foo')
|
||||
self.assertEqual(r.actions[0].tgt_package, 'bar')
|
||||
@ -565,5 +567,6 @@ Comment: <no comment>"""
|
||||
self.assertTrue(len(r.get_actions('submit', 'delete', 'change_devel')) == 5)
|
||||
self.assertTrue(len(r.get_actions()) == 8)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -10,6 +10,7 @@ from .common import GET, OscTestCase
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestResults)
|
||||
|
||||
|
||||
class TestResults(OscTestCase):
|
||||
def setUp(self):
|
||||
super().setUp(copytree=False)
|
||||
@ -31,13 +32,13 @@ class TestResults(OscTestCase):
|
||||
@GET('http://localhost/build/testproject/_result', file='result.xml')
|
||||
def testPrjresults(self):
|
||||
out = self._run_osc('prjresults', '--xml', 'testproject')
|
||||
self.assertEqualMultiline(out, self._get_fixture('result.xml')+'\n')
|
||||
self.assertEqualMultiline(out, self._get_fixture('result.xml') + '\n')
|
||||
|
||||
@GET('http://localhost/build/testproject/_result', file='result-dirty.xml')
|
||||
@GET('http://localhost/build/testproject/_result?oldstate=c57e2ee592dbbf26ebf19cc4f1bc1e83', file='result.xml')
|
||||
def testPrjresultsWatch(self):
|
||||
out = self._run_osc('prjresults', '--watch', '--xml', 'testproject')
|
||||
self.assertEqualMultiline(out, self._get_fixture('result-dirty.xml')+'\n'+self._get_fixture('result.xml')+'\n')
|
||||
self.assertEqualMultiline(out, self._get_fixture('result-dirty.xml') + '\n' + self._get_fixture('result.xml') + '\n')
|
||||
|
||||
@GET('http://localhost/build/testproject/_result?package=python-MarkupSafe&multibuild=1&locallink=1', file='result.xml')
|
||||
def testResults(self):
|
||||
@ -48,8 +49,8 @@ class TestResults(OscTestCase):
|
||||
@GET('http://localhost/build/testproject/_result?package=python-MarkupSafe&oldstate=c57e2ee592dbbf26ebf19cc4f1bc1e83&multibuild=1&locallink=1', file='result.xml')
|
||||
def testResultsWatch(self):
|
||||
out = self._run_osc('results', '--watch', '--xml', 'testproject', 'python-MarkupSafe')
|
||||
self.assertEqualMultiline(out, self._get_fixture('result-dirty.xml')+self._get_fixture('result.xml'))
|
||||
self.assertEqualMultiline(out, self._get_fixture('result-dirty.xml') + self._get_fixture('result.xml'))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
|
||||
@ -9,9 +9,11 @@ from .common import OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'revertfile_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestRevertFiles)
|
||||
|
||||
|
||||
class TestRevertFiles(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
@ -95,5 +97,6 @@ class TestRevertFiles(OscTestCase):
|
||||
self.assertTrue(os.path.exists(storefile))
|
||||
self.assertFilesEqual(fname, storefile)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -9,9 +9,11 @@ from .common import GET, PUT, OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'setlinkrev_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestSetLinkRev)
|
||||
|
||||
|
||||
class TestSetLinkRev(OscTestCase):
|
||||
def setUp(self):
|
||||
super().setUp(copytree=False)
|
||||
@ -89,5 +91,6 @@ class TestSetLinkRev(OscTestCase):
|
||||
"""delete non existent rev attribute from link xml"""
|
||||
osc.core.set_link_rev('http://localhost', 'osctest', 'simple', revision=None)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@ -10,9 +10,11 @@ from .common import GET, OscTestCase
|
||||
|
||||
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'update_fixtures')
|
||||
|
||||
|
||||
def suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromTestCase(TestUpdate)
|
||||
|
||||
|
||||
class TestUpdate(OscTestCase):
|
||||
def _get_fixtures_dir(self):
|
||||
return FIXTURES_DIR
|
||||
@ -62,7 +64,7 @@ class TestUpdate(OscTestCase):
|
||||
@GET('http://localhost/source/osctest/simple/_meta', file='meta.xml')
|
||||
def testUpdateUpstreamModifiedFile(self):
|
||||
"""a file was modified in the remote package (local file isn't modified)"""
|
||||
|
||||
|
||||
self._change_to_pkg('simple')
|
||||
osc.core.Package('.').update(rev=2)
|
||||
exp = 'U foo\nAt revision 2.\n'
|
||||
@ -285,5 +287,6 @@ class TestUpdate(OscTestCase):
|
||||
self.assertFalse(os.path.exists(os.path.join('.osc', 'added')))
|
||||
self._check_digests('testUpdateResumeDeletedFile_files')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user