mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 18:06:13 +01:00
Code

Merge pull request #1140 from dmach/fix-pylint-errors-and-warnings

Browse Source 
Fix pylint errors and warnings
This commit is contained in:
Daniel Mach 2022-09-12 14:44:55 +02:00 committed by GitHub
commit ef376af287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 1559 additions and 1428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osc/OscConfigParser.py
View File

@ -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,27 +76,30 @@ 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, dict = {}):
Line.__init__(self, sectname, 'section')
def __init__(self, sectname):
super().__init__(sectname, 'section')
self._lines = []
self._dict = dict
def _find(self, name):
for line in self._lines:
@ -103,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:
@ -124,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)
@ -155,12 +159,14 @@ class SectionLine(Line):
class CommentLine(Line):
"""Store a commentline"""
def __init__(self, line):
Line.__init__(self, line.strip('\n'), 'comment')
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
@ -177,7 +183,7 @@ class OptionLine(Line):
"""
def __init__(self, optname, line):
Line.__init__(self, optname, 'option')
super().__init__(optname, 'option')
self.name = optname
self.format(line)
@ -203,8 +209,9 @@ class OscConfigParser(configparser.ConfigParser):
In order to keep the order and the format it makes use of the ConfigLineOrder()
class.
"""
def __init__(self, defaults={}):
super().__init__(defaults)
def __init__(self, defaults=None):
super().__init__(defaults or {})
self._sections = ConfigLineOrder()
# XXX: unfortunately we have to override the _read() method from the ConfigParser()
@ -280,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
@ -303,7 +310,7 @@ class OscConfigParser(configparser.ConfigParser):
if e:
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

6
osc/babysitter.py
View File

@ -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'&lt;', b'<').replace(b'&gt;' , b'>').replace(b'&amp;', b'&')
msg = msg.replace(b'&lt;', b'<').replace(b'&gt;', b'>').replace(b'&amp;', b'&')
print(decode_it(msg), file=sys.stderr)
if e.code >= 500 and e.code <= 599:
print('\nRequest: %s' % e.filename)
@ -164,8 +164,8 @@ 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 ' \
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)

212
osc/build.py
View File

@ -3,6 +3,7 @@
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
import glob
import os
import re
import shutil
@ -22,7 +23,9 @@ from .core import get_buildinfo, store_read_project, store_read_package, meta_ex
from .core import get_binarylist, get_binary_file, run_external, return_external, raw_input
from .fetch import Fetcher, OscFileGrabber, verify_pacs
from .meter import create_text_meter
from .util import rpmquery, debquery, archquery
from .util import cpio
from .util import archquery, debquery, packagequery, rpmquery
from .util import repodata
from .util.helper import decode_it
@ -34,29 +37,29 @@ change_personality = {
'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' ],
'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]
@ -66,10 +69,12 @@ if hostarch == 'i686': # FIXME
if hostarch == 'parisc':
hostarch = 'hppa'
class Buildinfo:
"""represent the contents of a buildinfo file"""
def __init__(self, filename, apiurl, buildtype = 'spec', localpkgs = [], binarytype = 'rpm'):
def __init__(self, filename, apiurl, buildtype='spec', localpkgs=None, binarytype='rpm'):
localpkgs = localpkgs or []
try:
tree = ET.parse(filename)
except:
@ -81,7 +86,7 @@ class Buildinfo:
self.apiurl = apiurl
if root.find('error') != None:
if root.find('error') is not None:
sys.stderr.write('buildinfo is broken... it says:\n')
error = root.find('error').text
if error.startswith('unresolvable: '):
@ -118,16 +123,16 @@ class Buildinfo:
# hostarch: The architecture of the build environment (build arch in GNU defintion)
# crossarch: Same as hostarch, but indicating that a sysroot with an incompatible architecture exists
self.buildarch = root.find('arch').text
if root.find('crossarch') != None:
if root.find('crossarch') is not None:
self.crossarch = root.find('crossarch').text
else:
self.crossarch = None
if root.find('hostarch') != None:
if root.find('hostarch') is not None:
self.hostarch = root.find('hostarch').text
else:
self.hostarch = None
if root.find('release') != None:
if root.find('release') is not None:
self.release = root.find('release').text
else:
self.release = None
@ -141,7 +146,7 @@ class Buildinfo:
self.downloadurl = root.get('downloadurl')
self.debuginfo = 0
if root.find('debuginfo') != None:
if root.find('debuginfo') is not None:
try:
self.debuginfo = int(root.find('debuginfo').text)
except ValueError:
@ -162,7 +167,7 @@ class Buildinfo:
apiurl, localpkgs)
else:
pac_arch = self.crossarch
if pac_arch == None:
if pac_arch is None:
pac_arch = self.buildarch
p = Pac(node, pac_arch, self.pacsuffix,
apiurl, localpkgs)
@ -172,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') != None:
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:
@ -211,8 +215,9 @@ class Pac:
We build a map that's later used to fill our URL templates
"""
def __init__(self, node, buildarch, pacsuffix, apiurl, localpkgs = []):
def __init__(self, node, buildarch, pacsuffix, apiurl, localpkgs=None):
localpkgs = localpkgs or []
self.mp = {}
for i in ['binary', 'package',
'epoch', 'version', 'release', 'hdrmd5',
@ -232,7 +237,7 @@ class Pac:
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(':', ':/')
@ -278,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)
@ -347,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')
@ -438,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.
@ -464,9 +470,8 @@ def get_repo(path):
return repositoryDirectory
def get_prefer_pkgs(dirs, wanted_arch, type, cpio):
import glob
from .util import repodata, packagequery
paths = []
repositories = []
@ -539,14 +544,16 @@ 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)
for prj in projects:
if not prj in trusted:
if prj not 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)
@ -558,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
@ -573,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:
@ -581,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}
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:
@ -602,6 +614,7 @@ def su_wrapper(cmd):
cmd = sucmd + cmd
return cmd
def run_build(opts, *args):
cmd = [config['build-cmd']]
cmd += args
@ -612,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]
@ -758,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))
@ -887,13 +902,11 @@ def main(apiurl, opts, argv):
else:
print('Using local buildenv file: %s' % os.path.basename(buildenvfile))
if buildenvfile or servicefile:
from .util import cpio
if not cpiodata:
cpiodata = cpio.CpioWrite()
if opts.prefer_pkgs:
print('Scanning the following dirs for local packages: %s' % ', '.join(opts.prefer_pkgs))
from .util import cpio
if not cpiodata:
cpiodata = cpio.CpioWrite()
prefer_pkgs = get_prefer_pkgs(opts.prefer_pkgs, arch, build_type, cpiodata)
@ -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:
@ -990,10 +1003,10 @@ def main(apiurl, opts, argv):
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 ' \
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 ' \
print('The project \'%s\' does not exist - please '
'rerun with \'--alternative-project <alternative_project>\'' % prj, file=sys.stderr)
sys.exit(1)
else:
@ -1030,12 +1043,12 @@ def main(apiurl, opts, argv):
# vs.
# arch we are supposed to build for
if vm_type != "emulator" and vm_type != "qemu":
if bi.hostarch != None:
if hostarch != bi.hostarch and not bi.hostarch in can_also_build.get(hostarch, []):
if bi.hostarch is not None:
if hostarch != bi.hostarch and bi.hostarch not in can_also_build.get(hostarch, []):
print('Error: hostarch \'%s\' is required.' % (bi.hostarch), file=sys.stderr)
return 1
elif hostarch != bi.buildarch:
if not bi.buildarch in can_also_build.get(hostarch, []):
if bi.buildarch not in can_also_build.get(hostarch, []):
print('WARNING: It is guessed to build on hostarch \'%s\' for \'%s\' via QEMU user emulation.' % (hostarch, bi.buildarch), file=sys.stderr)
rpmlist_prefers = []
@ -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,21 +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,
api_host_options = config['api_host_options'],
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 = ''
@ -1116,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():
@ -1144,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
@ -1170,12 +1187,12 @@ 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 != None:
if old_pkg_dir is not None:
buildargs.append('--oldpackages=%s' % old_pkg_dir)
# Make packages from buildinfo available as repos for kiwi/docker/fissile
@ -1203,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:
@ -1277,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:
@ -1300,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')
@ -1329,7 +1346,6 @@ def main(apiurl, opts, argv):
if i.hdrmd5:
if not i.name.startswith('container:') and i.pacsuffix != 'rpm':
continue
from .util import packagequery
if i.name.startswith('container:'):
hdrmd5 = dgst(i.fullfilename)
else:
@ -1355,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)
@ -1394,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):
@ -1464,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))

16
osc/checker.py
View File

@ -8,11 +8,13 @@ import rpm
class KeyError(Exception):
def __init__(self, key, *args):
Exception.__init__(self)
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,9 +25,10 @@ class Checker:
self.ts.initDB()
self.ts.openDB()
self.ts.setVSFlags(0)
#self.ts.Debug(1)
# self.ts.Debug(1)
def readkeys(self, keys=[]):
def readkeys(self, keys=None):
keys = keys or []
rpm.addMacro('_dbpath', self.dbdir)
for key in keys:
try:
@ -33,7 +36,7 @@ class Checker:
except KeyError as e:
print(e)
if not len(self.imported):
if not self.imported:
raise KeyError('', "no key imported")
rpm.delMacro("_dbpath")
@ -68,7 +71,7 @@ class Checker:
if line[0:12] == "-----END PGP":
break
line = line.rstrip()
if (line[0] == '='):
if line[0] == '=':
crc = line[1:]
line = fd.readline()
break
@ -100,6 +103,7 @@ class Checker:
if fd is not None:
os.close(fd)
if __name__ == "__main__":
import sys
keyfiles = []

691
osc/commandline.py
View File

File diff suppressed because it is too large Load Diff

32
osc/conf.py
View File

@ -36,7 +36,6 @@ The configuration dictionary could look like this:
"""
import bz2
import errno
import getpass
import os
@ -83,6 +82,7 @@ def _identify_osccookiejar():
return os.path.join(osc_state_dir, 'cookiejar')
DEFAULTS = {'apiurl': 'https://api.opensuse.org',
'user': None,
'pass': None,
@ -178,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'):
@ -197,7 +197,7 @@ api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'realnam
'downloadurl', 'sshkey']
def apply_option_types(config):
def apply_option_types(config, conffile=""):
"""
Return a copy of `config` dictionary with values converted to their expected types
according to the enumerated option types (boolean_opts, integer_opts).
@ -431,7 +431,7 @@ your credentials for this apiurl.
def parse_apisrv_url(scheme, apisrv):
if apisrv.startswith('http://') or apisrv.startswith('https://'):
url = apisrv
elif scheme != None:
elif scheme is not None:
url = scheme + apisrv
else:
url = "https://" + apisrv
@ -493,7 +493,7 @@ 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\'' \
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']
@ -559,7 +559,7 @@ def config_set_option(section, opt, val=None, delete=False, update=True, creds_m
"""
cp = get_configParser(config['conffile'])
# don't allow "internal" options
general_opts = [i for i in DEFAULTS.keys() if not i in ['user', 'pass', 'passx']]
general_opts = [i for i in DEFAULTS.keys() if i not in ['user', 'pass', 'passx']]
if section != 'general':
section = config['apiurl_aliases'].get(section, section)
scheme, host, path = \
@ -577,10 +577,10 @@ def config_set_option(section, opt, val=None, delete=False, update=True, creds_m
sections[apiurl] = url
section = sections.get(section.rstrip('/'), section)
if not section in cp.sections():
if section not in cp.sections():
raise oscerr.ConfigError('unknown section \'%s\'' % section, config['conffile'])
if section == 'general' and not opt in general_opts or \
section != 'general' and not opt in api_host_options:
if section == 'general' and opt not in general_opts or \
section != 'general' and opt not in api_host_options:
raise oscerr.ConfigError('unknown config option \'%s\'' % opt, config['conffile'])
if not val and not delete and opt == 'pass' and creds_mgr_descr is not None:
@ -635,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
@ -645,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
@ -705,7 +707,7 @@ def _get_credentials_manager(url, cp):
class APIHostOptionsEntry(dict):
def __getitem__(self, key, *args, **kwargs):
value = super(self.__class__, self).__getitem__(key, *args, **kwargs)
value = super().__getitem__(key, *args, **kwargs)
if key == 'pass' and callable(value):
print('Warning: use of a deprecated credentials manager API.',
file=sys.stderr)
@ -732,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
@ -759,7 +761,7 @@ def get_config(override_conffile=None,
config = dict(cp.items('general', raw=1))
config['conffile'] = conffile
config = apply_option_types(config)
config = apply_option_types(config, conffile)
config['packagecachedir'] = os.path.expanduser(config['packagecachedir'])
config['exclude_glob'] = config['exclude_glob'].split()
@ -831,7 +833,7 @@ def get_config(override_conffile=None,
if cp.has_option(url, 'build-root', proper=True):
api_host_options[apiurl]['build-root'] = cp.get(url, 'build-root', raw=True)
if not 'sslcertck' in api_host_options[apiurl]:
if 'sslcertck' not in api_host_options[apiurl]:
api_host_options[apiurl]['sslcertck'] = True
if 'allow_http' not in api_host_options[apiurl]:
@ -868,7 +870,7 @@ 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' \
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)
@ -933,6 +935,7 @@ def identify_conf():
return conffile
def interactive_config_setup(conffile, apiurl, initial=True):
scheme = urlsplit(apiurl)[0]
http = scheme == "http"
@ -959,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)

8
osc/connection.py
View File

@ -44,7 +44,7 @@ class MockRequest:
return self.headers.get(header_name, default)
def has_header(self, header_name):
return (header_name in self.headers)
return header_name in self.headers
def add_unredirected_header(self, key, val):
# modifies the `headers` variable that was passed to object's constructor
@ -97,9 +97,6 @@ def get_proxy_manager(env):
else:
proxy_url = f"{proxy_purl.scheme}://{proxy_purl.host}"
# import osc.core here to avoid cyclic imports
from . import core
proxy_headers = urllib3.make_headers(
proxy_basic_auth=proxy_purl.auth,
user_agent=f"osc/{__version__}",
@ -167,9 +164,6 @@ def http_request(method, url, headers=None, data=None, file=None):
:param file: Path to a file to send as data in the request body (conflicts with `data`).
"""
# import osc.core here to avoid cyclic imports
from . import core
purl = urllib3.util.parse_url(url)
apiurl = conf.extract_known_apiurl(url)
headers = urllib3.response.HTTPHeaderDict(headers or {})

789
osc/core.py
View File

File diff suppressed because it is too large Load Diff

10
osc/credentials.py
View File

@ -137,17 +137,17 @@ class ObfuscatedConfigFileCredentialsManager(PlaintextConfigFileCredentialsManag
if self._cp.has_option(url, 'passx', proper=True):
passwd = self._cp.get(url, 'passx', raw=True)
else:
passwd = super(self.__class__, self).get_password(url, user, apiurl=apiurl)
passwd = super().get_password(url, user, apiurl=apiurl)
return self.decode_password(passwd)
def set_password(self, url, user, password):
compressed_pw = bz2.compress(password.encode('ascii'))
password = base64.b64encode(compressed_pw).decode("ascii")
super(self.__class__, self).set_password(url, user, password)
super().set_password(url, user, password)
def delete_password(self, url, user):
self._cp.remove_option(url, 'passx')
super(self.__class__, self).delete_password(url, user)
super().delete_password(url, user)
@classmethod
def decode_password(cls, password):
@ -174,7 +174,7 @@ class ObfuscatedConfigFileDescriptor(AbstractCredentialsManagerDescriptor):
class TransientCredentialsManager(AbstractCredentialsManager):
def __init__(self, *args, **kwargs):
super(self.__class__, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self._password = None
def _process_options(self, options):
@ -232,7 +232,7 @@ class KeyringCredentialsManager(AbstractCredentialsManager):
def create(cls, cp, options):
if not has_keyring_support():
return None
return super(cls, cls).create(cp, options)
return super().create(cp, options)
def _get_password(self, url, user, apiurl=None):
self._load_backend()

19
osc/fetch.py
View File

@ -6,14 +6,17 @@
import os
import re
import shutil
import subprocess
import sys
import tempfile
from urllib.parse import quote_plus
from urllib.request import HTTPError
from . import checker as osc_checker
from . import conf
from . import oscerr
from .core import makeurl, streamfile, dgst
from .core import makeurl, dgst
from .grabber import OscFileGrabber, OscMirrorGroup
from .meter import create_text_meter
from .util import packagequery, cpio
@ -21,9 +24,9 @@ from .util.helper import decode_it
class Fetcher:
def __init__(self, cachedir='/tmp', api_host_options={}, urllist=[],
def __init__(self, cachedir='/tmp', urllist=None,
http_debug=False, cookiejar=None, offline=False,
enable_cpio=True, modules=[], download_api_only=False):
enable_cpio=True, modules=None, download_api_only=False):
# set up progress bar callback
self.progress_obj = None
if sys.stdout.isatty():
@ -31,8 +34,8 @@ class Fetcher:
self.cachedir = cachedir
# generic download URL lists
self.urllist = urllist
self.modules = modules
self.urllist = urllist or []
self.modules = modules or []
self.http_debug = http_debug
self.offline = offline
self.cpio = {}
@ -155,7 +158,6 @@ class Fetcher:
os.unlink(tmpfile.name)
def move_package(self, tmpfile, destdir, pac_obj=None):
import shutil
canonname = None
if pac_obj and pac_obj.name.startswith('container:'):
canonname = pac_obj.canonname
@ -324,8 +326,6 @@ def verify_pacs_old(pac_list):
Check all packages in one go, since this takes only 6 seconds on my Athlon 700
instead of 20 when calling 'rpm -K' for each of them.
"""
import subprocess
if not pac_list:
return
@ -403,9 +403,8 @@ def verify_pacs(bi):
print("using keys from", ', '.join(bi.prjkeys))
from . import checker
failed = False
checker = checker.Checker()
checker = osc_checker.Checker()
try:
checker.readkeys(bi.keys)
for pkg in pac_list:

1
osc/grabber.py
View File

@ -5,7 +5,6 @@
import os
import sys
from urllib.request import HTTPError
from urllib.parse import urlparse
from urllib.parse import unquote

1
osc/meter.py
View File

@ -62,6 +62,7 @@ def create_text_meter(*args, **kwargs):
return TextMeter(*args, **kwargs)
return None
if have_pb_module:
TextMeter = PBTextMeter
else:

78
osc/oscerr.py
View File

@ -4,120 +4,148 @@
# either version 2, or (at your option) any later version.
class OscBaseError(Exception):
def __init__(self, args=()):
Exception.__init__(self)
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):
OscBaseError.__init__(self)
super().__init__()
self.msg = msg
self.file = fname
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):
ConfigError.__init__(self, msg, fname)
super().__init__(msg, fname)
self.url = url
class ConfigMissingCredentialsError(ConfigError):
def __init__(self, msg, fname, url):
ConfigError.__init__(self, msg, fname)
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):
OscBaseError.__init__(self)
super().__init__()
self.msg = msg
class NoConfigfile(OscBaseError):
"""Exception raised when osc's configfile cannot be found"""
def __init__(self, fname, msg):
OscBaseError.__init__(self)
super().__init__()
self.file = fname
self.msg = msg
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):
OscBaseError.__init__(self)
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):
OscBaseError.__init__(self)
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.' \
'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):
OscBaseError.__init__(self)
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):
PackageError.__init__(self, prj, pac)
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):
PackageError.__init__(self, prj, pac)
super().__init__(prj, pac)
self.msg = msg
class OscIOError(OscBaseError):
def __init__(self, e, msg):
OscBaseError.__init__(self)
super().__init__()
self.e = e
self.msg = msg
@ -133,6 +161,7 @@ class OscInvalidRevision(OscValueError):
"""
Invalid revision value.
"""
def __str__(self):
return "Invalid revision value: {}".format("".join(self.args))
@ -141,43 +170,52 @@ class PackageNotInstalled(OscBaseError):
"""
Exception raised when a package is not installed on local system
"""
def __init__(self, pkg):
OscBaseError.__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):
PackageError.__init__(self, prj, pac)
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):
PackageError.__init__(self, prj, pac)
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):
PackageError.__init__(self, prj, pac)
super().__init__(prj, pac)
self.file = file
self.msg = msg
class PackageInternalError(PackageError):
def __init__(self, prj, pac, msg):
PackageError.__init__(self, prj, pac)
super().__init__(prj, pac)
self.msg = msg
# vim: sw=4 et

4
osc/oscssl.py
View File

@ -1,14 +1,10 @@
import binascii
import datetime
import errno
import os
import socket
import ssl
import sys
import tempfile
import typing
import urllib3.connection
from cryptography import x509
from cryptography.hazmat.primitives import hashes
from cryptography.hazmat.primitives import serialization

12
osc/util/ar.py
View File

@ -28,7 +28,7 @@ if not hasattr(os, 'SEEK_SET'):
class ArError(Exception):
"""Base class for all ar related errors"""
def __init__(self, fn, msg):
Exception.__init__(self)
super().__init__()
self.file = fn
self.msg = msg
@ -57,7 +57,7 @@ class ArHdr:
class ArFile(BytesIO):
"""Represents a file which resides in the archive"""
def __init__(self, fn, uid, gid, mode, buf):
BytesIO.__init__(self, buf)
super().__init__(buf)
self.name = fn
self.uid = uid
self.gid = gid
@ -97,9 +97,9 @@ class Ar:
re.DOTALL)
def __init__(self, fn = None, fh = None):
if fn == None and fh == None:
raise ValueError('either \'fn\' or \'fh\' must be != None')
if fh != None:
if fn is None and fh is None:
raise ValueError('either \'fn\' or \'fh\' must be is not None')
if fh is not None:
self.__file = fh
self.__closefile = False
self.filename = fh.name
@ -169,7 +169,7 @@ class Ar:
if data != b'!<arch>':
raise ArError(self.filename, 'no ar archive')
pos = 8
while (len(data) != 0):
while len(data) != 0:
self.__file.seek(pos, os.SEEK_SET)
data = self.__file.read(self.hdr_len)
if not data:

7
osc/util/archquery.py
View File

@ -1,7 +1,7 @@
import os
import re
import subprocess
import tarfile
import sys
from . import packagequery
@ -51,14 +51,14 @@ class ArchQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
def version(self):
pkgver = self.fields['pkgver'][0] if 'pkgver' in self.fields else None
if pkgver != None:
if pkgver is not None:
pkgver = re.sub(br'[0-9]+:', b'', pkgver, 1)
pkgver = re.sub(br'-[^-]*$', b'', pkgver)
return pkgver
def release(self):
pkgver = self.fields['pkgver'][0] if 'pkgver' in self.fields else None
if pkgver != None:
if pkgver is not None:
m = re.search(br'-([^-])*$', pkgver)
if m:
return m.group(1)
@ -207,7 +207,6 @@ class ArchQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
if __name__ == '__main__':
import sys
archq = ArchQuery.query(sys.argv[1])
print(archq.name(), archq.version(), archq.release(), archq.arch())
try:

5
osc/util/cpio.py
View File

@ -14,7 +14,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
import mmap
import os
import stat
import struct
@ -30,7 +29,7 @@ if not hasattr(os, 'SEEK_SET'):
class CpioError(Exception):
"""base class for all cpio related errors"""
def __init__(self, fn, msg):
Exception.__init__(self)
super().__init__()
self.file = fn
self.msg = msg
def __str__(self):
@ -153,7 +152,7 @@ class CpioRead:
if not self.format in self.sfmt.values():
raise CpioError(self.filename, '\'%s\' is not a supported cpio format' % self.format)
pos = 0
while (len(data) != 0):
while len(data) != 0:
self.__file.seek(pos, os.SEEK_SET)
data = self.__file.read(self.hdr_len)
if not data:

2
osc/util/debquery.py
View File

@ -1,6 +1,7 @@
import itertools
import os
import re
import sys
import tarfile
from io import BytesIO
@ -249,7 +250,6 @@ class DebQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
return b'%s_%s_%s.deb' % (name, version, arch)
if __name__ == '__main__':
import sys
try:
debq = DebQuery.query(sys.argv[1])
except DebError as e:

2
osc/util/helper.py
View File

@ -4,6 +4,7 @@
# either version 2, or (at your option) any later version.
import builtins
import html
from .. import oscerr
@ -39,7 +40,6 @@ def decode_it(obj):
def raw_input(*args):
import builtins
func = builtins.input
try:

5
osc/util/packagequery.py
View File

@ -1,10 +1,12 @@
import sys
from .helper import decode_it
class PackageError(Exception):
"""base class for all package related errors"""
def __init__(self, fname, msg):
Exception.__init__(self)
super().__init__()
self.fname = fname
self.msg = msg
@ -166,7 +168,6 @@ def cmp(a, b):
if __name__ == '__main__':
import sys
try:
pkgq = PackageQuery.query(sys.argv[1])
except PackageError as e:

2
osc/util/rpmquery.py
View File

@ -1,6 +1,7 @@
import os
import re
import struct
import sys
from . import packagequery
from .helper import decode_it
@ -385,7 +386,6 @@ def unpack_string(data, encoding=None):
return data
if __name__ == '__main__':
import sys
try:
rpmq = RpmQuery.query(sys.argv[1])
except RpmError as e:

7
tests/common.py
View File

@ -64,8 +64,9 @@ 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):
Exception.__init__(self)
super().__init__()
self.url = url
self.exp_url = exp_url
self.method = method
@ -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:

6
tests/test_addfiles.py
View File

@ -1,5 +1,6 @@
import os
import sys
import unittest
import osc.core
import osc.oscerr
@ -9,10 +10,11 @@ from .common import OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'addfile_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestAddFiles)
class TestAddFiles(OscTestCase):
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -83,6 +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__':
import unittest
unittest.main()

7
tests/test_commit.py
View File

@ -1,5 +1,6 @@
import os
import sys
import unittest
from urllib.error import HTTPError
from xml.etree import ElementTree as ET
@ -11,12 +12,14 @@ from .common import GET, PUT, POST, DELETE, OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'commit_fixtures')
def suite():
import unittest
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
@ -368,6 +371,6 @@ class TestCommit(OscTestCase):
self._check_status(p, 'add', '!')
self._check_status(p, 'bar', ' ')
if __name__ == '__main__':
import unittest
unittest.main()

1
tests/test_core.py
View File

@ -48,5 +48,4 @@ class TestParseRevisionOption(unittest.TestCase):
if __name__ == "__main__":
import unittest
unittest.main()

6
tests/test_deletefiles.py
View File

@ -1,4 +1,5 @@
import os
import unittest
import osc.core
import osc.oscerr
@ -8,10 +9,11 @@ from .common import OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'deletefile_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestDeleteFiles)
class TestDeleteFiles(OscTestCase):
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -205,6 +207,6 @@ class TestDeleteFiles(OscTestCase):
self.assertTrue(ret[0] == exp1)
self.assertTrue(ret[1] == exp2)
if __name__ == '__main__':
import unittest
unittest.main()

7
tests/test_difffiles.py
View File

@ -1,5 +1,6 @@
import os
import re
import unittest
import osc.core
import osc.oscerr
@ -10,12 +11,14 @@ from .common import GET, OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'difffile_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestDiffFiles)
class TestDiffFiles(OscTestCase):
diff_hdr = 'Index: %s\n==================================================================='
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -335,6 +338,6 @@ Binary file 'binary' has changed.
exp = __canonise_diff(exp)
self.assertEqualMultiline(got, exp)
if __name__ == '__main__':
import unittest
unittest.main()

4
tests/test_helpers.py
View File

@ -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()

8
tests/test_init_package.py
View File

@ -1,4 +1,5 @@
import os
import unittest
import osc.core
import osc.oscerr
@ -8,10 +9,11 @@ from .common import OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'init_package_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestInitPackage)
class TestInitPackage(OscTestCase):
def _get_fixtures_dir(self):
# workaround for git because it doesn't allow empty dirs
@ -22,7 +24,7 @@ class TestInitPackage(OscTestCase):
def tearDown(self):
if os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')):
os.rmdir(os.path.join(FIXTURES_DIR, 'osctest'))
OscTestCase.tearDown(self)
super().tearDown()
def test_simple(self):
"""initialize a package dir"""
@ -88,6 +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__':
import unittest
unittest.main()

10
tests/test_init_project.py
View File

@ -1,5 +1,7 @@
import os
import unittest
import osc.conf
import osc.core
import osc.oscerr
@ -8,10 +10,11 @@ from .common import GET, OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'init_project_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestInitProject)
class TestInitProject(OscTestCase):
def _get_fixtures_dir(self):
# workaround for git because it doesn't allow empty dirs
@ -22,7 +25,7 @@ class TestInitProject(OscTestCase):
def tearDown(self):
if os.path.exists(os.path.join(FIXTURES_DIR, 'osctest')):
os.rmdir(os.path.join(FIXTURES_DIR, 'osctest'))
OscTestCase.tearDown(self)
super().tearDown()
def test_simple(self):
"""initialize a project dir"""
@ -58,7 +61,6 @@ class TestInitProject(OscTestCase):
disable wc_check (because we didn't disable the package tracking before the Project class
was imported therefore REQ_STOREFILES contains '_packages')
"""
import osc.conf
# disable package tracking
osc.conf.config['do_package_tracking'] = False
prj_dir = os.path.join(self.tmpdir, 'testprj')
@ -70,6 +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__':
import unittest
unittest.main()

6
tests/test_package_status.py
View File

@ -1,4 +1,5 @@
import os
import unittest
import osc.core
import osc.oscerr
@ -8,10 +9,11 @@ from .common import OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'project_package_status_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestPackageStatus)
class TestPackageStatus(OscTestCase):
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -84,6 +86,6 @@ class TestPackageStatus(OscTestCase):
st = p.get_status(True)
self.assertEqual(exp_st, st)
if __name__ == '__main__':
import unittest
unittest.main()

23
tests/test_prdiff.py
View File

@ -1,6 +1,7 @@
import os
import re
import sys
import unittest
import osc.commandline
import osc.core
@ -13,10 +14,12 @@ FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'prdiff_fixtures')
UPSTREAM = 'some:project'
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)
@ -42,11 +45,12 @@ def POST_RDIFF(oldprj, newprj):
def suite():
import unittest
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,7 +179,6 @@ 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-three', 'old:prj', 'new:prj'), exp='', text='')
@ -195,7 +191,6 @@ 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-three', 'old:prj', 'new:prj'), exp='', text='')
@ -207,7 +202,6 @@ 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')
def testPrdiffIncludeExclude(self):
@ -219,7 +213,6 @@ 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='')
@ -241,8 +234,8 @@ 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='')
@ -260,7 +253,5 @@ identical: only-in-new
self.assertEqualMultiline(out, exp)
if __name__ == '__main__':
import unittest
unittest.main()

6
tests/test_project_status.py
View File

@ -1,4 +1,5 @@
import os
import unittest
import osc.core
import osc.oscerr
@ -8,10 +9,11 @@ from .common import OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'project_package_status_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestProjectStatus)
class TestProjectStatus(OscTestCase):
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -159,6 +161,6 @@ class TestProjectStatus(OscTestCase):
p = prj.get_pacobj('doesnotexist')
self.assertTrue(isinstance(p, type(None)))
if __name__ == '__main__':
import unittest
unittest.main()

7
tests/test_repairwc.py
View File

@ -1,5 +1,7 @@
import os
import shutil
import sys
import unittest
from xml.etree import ElementTree as ET
import osc.core
@ -10,10 +12,11 @@ from .common import GET, PUT, POST, DELETE, OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'repairwc_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestRepairWC)
class TestRepairWC(OscTestCase):
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -214,7 +217,6 @@ class TestRepairWC(OscTestCase):
def test_project_noapiurl(self):
"""the project wc has no _apiurl file"""
import shutil
prj_dir = os.path.join(self.tmpdir, 'prj_noapiurl')
shutil.copytree(os.path.join(self._get_fixtures_dir(), 'prj_noapiurl'), prj_dir)
storedir = os.path.join(prj_dir, osc.core.store)
@ -227,5 +229,4 @@ class TestRepairWC(OscTestCase):
if __name__ == '__main__':
import unittest
unittest.main()

8
tests/test_request.py
View File

@ -1,4 +1,5 @@
import os
import unittest
from xml.etree import ElementTree as ET
import osc.core
@ -9,16 +10,17 @@ from .common import OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'request_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestRequest)
class TestRequest(OscTestCase):
def _get_fixtures_dir(self):
return FIXTURES_DIR
def setUp(self):
OscTestCase.setUp(self, copytree=False)
super().setUp(copytree=False)
def test_createsr(self):
"""create a simple submitrequest"""
@ -565,6 +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__':
import unittest
unittest.main()

14
tests/test_results.py
View File

@ -1,5 +1,6 @@
import os
import sys
import unittest
import osc.commandline
@ -7,12 +8,12 @@ from .common import GET, OscTestCase
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestResults)
class TestResults(OscTestCase):
def setUp(self):
OscTestCase.setUp(self, copytree=False)
super().setUp(copytree=False)
def _get_fixtures_name(self):
return 'results_fixtures'
@ -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,9 +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__':
import unittest
unittest.main()

6
tests/test_revertfiles.py
View File

@ -1,4 +1,5 @@
import os
import unittest
import osc.core
import osc.oscerr
@ -8,10 +9,11 @@ from .common import OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'revertfile_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestRevertFiles)
class TestRevertFiles(OscTestCase):
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -95,6 +97,6 @@ class TestRevertFiles(OscTestCase):
self.assertTrue(os.path.exists(storefile))
self.assertFilesEqual(fname, storefile)
if __name__ == '__main__':
import unittest
unittest.main()

8
tests/test_setlinkrev.py
View File

@ -1,4 +1,5 @@
import os
import unittest
import osc.core
import osc.oscerr
@ -8,13 +9,14 @@ from .common import GET, PUT, OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'setlinkrev_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestSetLinkRev)
class TestSetLinkRev(OscTestCase):
def setUp(self):
OscTestCase.setUp(self, copytree=False)
super().setUp(copytree=False)
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -89,6 +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__':
import unittest
unittest.main()

6
tests/test_update.py
View File

@ -1,5 +1,6 @@
import os
import sys
import unittest
import osc.core
import osc.oscerr
@ -9,10 +10,11 @@ from .common import GET, OscTestCase
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), 'update_fixtures')
def suite():
import unittest
return unittest.defaultTestLoader.loadTestsFromTestCase(TestUpdate)
class TestUpdate(OscTestCase):
def _get_fixtures_dir(self):
return FIXTURES_DIR
@ -285,6 +287,6 @@ class TestUpdate(OscTestCase):
self.assertFalse(os.path.exists(os.path.join('.osc', 'added')))
self._check_digests('testUpdateResumeDeletedFile_files')
if __name__ == '__main__':
import unittest
unittest.main()