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

Add more config options among integer options

Browse Source
This commit is contained in:
Daniel Mach 2023-08-15 14:21:53 +02:00
parent 57a4cdc6a4
commit f9dc3122f9
2 changed files with 380 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osc/conf.py
View File

@ -97,12 +97,12 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org',
'build-root': '/var/tmp/build-root/%(repo)s-%(arch)s',
'build-uid': '', # use the default provided by build
'build-device': '', # required for VM builds
'build-memory': '', # required for VM builds
'build-memory': '0', # required for VM builds
'build-shell-after-fail': '0', # optional for VM builds
'build-swap': '', # optional for VM builds
'build-vmdisk-rootsize': '', # optional for VM builds
'build-vmdisk-swapsize': '', # optional for VM builds
'build-vmdisk-filesystem': '', # optional for VM builds
'build-vmdisk-rootsize': '0', # optional for VM builds
'build-vmdisk-swapsize': '0', # optional for VM builds
'build-vmdisk-filesystem': '', # optional for VM builds
'build-vm-user': '', # optional for VM builds
'build-kernel': '', # optional for VM builds
'build-initrd': '', # optional for VM builds
@ -213,7 +213,8 @@ api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'realnam
# _integer_opts and _boolean_opts specify option types for both global options as well as api_host_options
_integer_opts = ('build-jobs',)
_integer_opts = ("build-jobs", "build-memory", "build-vmdisk-rootsize", "build-vmdisk-swapsize", "http_retries", "icecream", "request_list_days")
_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',

411
tests/test_conf.py
View File

@ -1,56 +1,393 @@
import importlib
import os
import shutil
import tempfile
import unittest
import osc.conf
FIXTURES_DIR = os.path.join(os.path.dirname(__file__), "conf_fixtures")
OSCRC = """
[general]
apiurl = https://api.opensuse.org
user = Admin
pass = opensuse
passx = unused
sshkey = ~/.ssh/id_rsa.pub
packagecachedir = /var/tmp/osbuild-packagecache
su-wrapper = sudo
build-cmd = /usr/bin/build
build-type = kvm
build-root = /var/tmp/build-root/%(repo)s-%(arch)s
build-uid = 1000:1000
build-device = /dev/null
build-memory = 1024
build-shell-after-fail = 0
build-swap = /tmp/build-swap
build-vmdisk-rootsize = 10240
build-vmdisk-swapsize = 512
build-vmdisk-filesystem = ext4
build-vm-user = abuild
build-kernel = /boot/vmlinuz
build-initrd = /boot/initrd
download-assets-cmd = /usr/lib/build/download_assets
build-jobs = 4
builtin_signature_check = 1
icecream = 0
ccache = 0
sccache = 0
sccache_uri = file:///var/tmp/osbuild-sccache
buildlog_strip_time = 0
debug = 0
http_debug = 0
http_full_debug = 0
http_retries = 3
verbose = 0
no_preinstallimage = 0
traceback = 0
post_mortem = 0
use_keyring = 0
cookiejar = ~/.local/state/osc/cookiejar
no_verify = 0
disable_hdrmd5_check = 0
do_package_tracking = 1
extra-pkgs = vim strace
build_repository = openSUSE_Factory
getpac_default_project = openSUSE:Factory
checkout_no_colon = 0
project_separator = :
checkout_rooted = 0
exclude_glob = .osc CVS .svn .* _linkerror *~ #*# *.orig *.bak *.changes.vctmp.*
print_web_links = 0
request_list_days = 0
check_filelist = 1
check_for_request_on_action = 1
submitrequest_on_accept_action = cleanup
request_show_interactive = 0
request_show_source_buildstatus = 0
review_inherit_group = 0
submitrequest_accepted_template = bla bla
submitrequest_declined_template = bla bla
linkcontrol = 0
include_request_from_project = 1
local_service_run = 1
maintained_attribute = OBS:Maintained
maintenance_attribute = OBS:MaintenanceProject
maintained_update_project_attribute = OBS:UpdateProject
show_download_progress = 0
vc-cmd = /usr/lib/build/vc
status_mtime_heuristic = 0
[https://api.opensuse.org]
credentials_mgr_class=osc.credentials.PlaintextConfigFileCredentialsManager
user = Admin
pass = opensuse
passx = unused
aliases = osc
http_headers =
authorization: Basic QWRtaW46b3BlbnN1c2U=
realname = The Administrator
email = admin@example.com
sslcertck = 1
cafile = unused
capath = unused
trusted_prj = openSUSE:* SUSE:*
downloadurl = http://example.com/
sshkey = ~/.ssh/id_rsa.pub
disable_hdrmd5_check = 0
"""
class TestConf(unittest.TestCase):
class TestExampleConfig(unittest.TestCase):
def setUp(self):
# reset the global `config` in preparation for running the tests
importlib.reload(osc.conf)
self.tmpdir = tempfile.mkdtemp(prefix="osc_test_")
self.oscrc = os.path.join(self.tmpdir, "oscrc")
with open(self.oscrc, "w", encoding="utf-8") as f:
f.write(OSCRC)
osc.conf.get_config(override_conffile=self.oscrc)
self.config = osc.conf.config
def tearDown(self):
# reset the global `config` to avoid impacting tests from other classes
importlib.reload(osc.conf)
shutil.rmtree(self.tmpdir)
def _get_fixtures_dir(self):
return FIXTURES_DIR
def test_apiurl(self):
self.assertEqual(self.config["apiurl"], "https://api.opensuse.org")
def test_bool_opts_defaults(self):
config = osc.conf.config
for opt in osc.conf._boolean_opts:
if opt not in config:
continue
self.assertIsInstance(config[opt], bool, msg=f"option: '{opt}'")
def test_user(self):
self.assertEqual(self.config["user"], "Admin")
def test_int_opts_defaults(self):
config = osc.conf.config
for opt in osc.conf._integer_opts:
if opt not in config:
continue
self.assertIsInstance(config[opt], int, msg=f"option: '{opt}'")
def test_pass(self):
self.assertEqual(self.config["pass"], "opensuse")
def test_bool_opts(self):
oscrc = os.path.join(self._get_fixtures_dir(), "oscrc")
osc.conf.get_config(override_conffile=oscrc, override_no_keyring=True)
config = osc.conf.config
for opt in osc.conf._boolean_opts:
if opt not in config:
continue
self.assertIsInstance(config[opt], bool, msg=f"option: '{opt}'")
def test_passx(self):
self.assertEqual(self.config["passx"], "unused")
def test_int_opts(self):
oscrc = os.path.join(self._get_fixtures_dir(), "oscrc")
osc.conf.get_config(override_conffile=oscrc, override_no_keyring=True)
config = osc.conf.config
for opt in osc.conf._integer_opts:
if opt not in config:
continue
self.assertIsInstance(config[opt], int, msg=f"option: '{opt}'")
def test_sshkey(self):
self.assertEqual(self.config["sshkey"], "~/.ssh/id_rsa.pub")
def test_packagecachedir(self):
self.assertEqual(self.config["packagecachedir"], "/var/tmp/osbuild-packagecache")
def test_su_wrapper(self):
self.assertEqual(self.config["su-wrapper"], "sudo")
def test_build_cmd(self):
self.assertEqual(self.config["build-cmd"], "/usr/bin/build")
def test_build_type(self):
self.assertEqual(self.config["build-type"], "kvm")
def test_build_root(self):
self.assertEqual(self.config["build-root"], "/var/tmp/build-root/%(repo)s-%(arch)s")
def test_build_uid(self):
self.assertEqual(self.config["build-uid"], "1000:1000")
def test_build_device(self):
self.assertEqual(self.config["build-device"], "/dev/null")
def test_build_memory(self):
self.assertEqual(self.config["build-memory"], 1024)
def test_build_shell_after_fail(self):
self.assertEqual(self.config["build-shell-after-fail"], False)
def test_build_swap(self):
self.assertEqual(self.config["build-swap"], "/tmp/build-swap")
def test_build_vmdisk_rootsize(self):
self.assertEqual(self.config["build-vmdisk-rootsize"], 10240)
def test_build_vmdisk_swapsize(self):
self.assertEqual(self.config["build-vmdisk-swapsize"], 512)
def test_build_vmdisk_filesystem(self):
self.assertEqual(self.config["build-vmdisk-filesystem"], "ext4")
def test_build_vm_user(self):
self.assertEqual(self.config["build-vm-user"], "abuild")
def test_build_kernel(self):
self.assertEqual(self.config["build-kernel"], "/boot/vmlinuz")
def test_build_initrd(self):
self.assertEqual(self.config["build-initrd"], "/boot/initrd")
def test_download_assets_cmd(self):
self.assertEqual(self.config["download-assets-cmd"], "/usr/lib/build/download_assets")
def test_build_jobs(self):
self.assertEqual(self.config["build-jobs"], 4)
def test_builtin_signature_check(self):
self.assertEqual(self.config["builtin_signature_check"], True)
def test_icecream(self):
self.assertEqual(self.config["icecream"], 0)
def test_ccache(self):
self.assertEqual(self.config["ccache"], False)
def test_sccache(self):
self.assertEqual(self.config["sccache"], False)
def test_sccache_uri(self):
self.assertEqual(self.config["sccache_uri"], "file:///var/tmp/osbuild-sccache")
def test_buildlog_strip_time(self):
self.assertEqual(self.config["buildlog_strip_time"], False)
def test_debug(self):
self.assertEqual(self.config["debug"], False)
def test_http_debug(self):
self.assertEqual(self.config["http_debug"], False)
def test_http_full_debug(self):
self.assertEqual(self.config["http_full_debug"], False)
def test_http_retries(self):
self.assertEqual(self.config["http_retries"], 3)
def test_verbose(self):
self.assertEqual(self.config["verbose"], False)
def test_no_preinstallimage(self):
self.assertEqual(self.config["no_preinstallimage"], False)
def test_traceback(self):
self.assertEqual(self.config["traceback"], False)
def test_post_mortem(self):
self.assertEqual(self.config["post_mortem"], False)
def test_use_keyring(self):
self.assertEqual(self.config["use_keyring"], False)
def test_cookiejar(self):
self.assertEqual(self.config["cookiejar"], "~/.local/state/osc/cookiejar")
def test_no_verify(self):
self.assertEqual(self.config["no_verify"], False)
def test_disable_hdrmd5_check(self):
self.assertEqual(self.config["disable_hdrmd5_check"], False)
def test_do_package_tracking(self):
self.assertEqual(self.config["do_package_tracking"], True)
def test_extra_pkgs(self):
self.assertEqual(self.config["extra-pkgs"], ["vim", "strace"])
def test_build_repository(self):
self.assertEqual(self.config["build_repository"], "openSUSE_Factory")
def test_getpac_default_project(self):
self.assertEqual(self.config["getpac_default_project"], "openSUSE:Factory")
def test_checkout_no_colon(self):
self.assertEqual(self.config["checkout_no_colon"], False)
def test_project_separator(self):
self.assertEqual(self.config["project_separator"], ":")
def test_checkout_rooted(self):
self.assertEqual(self.config["checkout_rooted"], False)
def test_exclude_glob(self):
self.assertEqual(
self.config["exclude_glob"],
[
".osc",
"CVS",
".svn",
".*",
"_linkerror",
"*~",
"#*#",
"*.orig",
"*.bak",
"*.changes.vctmp.*",
],
)
def test_print_web_links(self):
self.assertEqual(self.config["print_web_links"], False)
def test_request_list_days(self):
self.assertEqual(self.config["request_list_days"], 0)
def test_check_filelist(self):
self.assertEqual(self.config["check_filelist"], True)
def test_check_for_request_on_action(self):
self.assertEqual(self.config["check_for_request_on_action"], True)
def test_submitrequest_on_accept_action(self):
self.assertEqual(self.config["submitrequest_on_accept_action"], "cleanup")
def test_request_show_interactive(self):
self.assertEqual(self.config["request_show_interactive"], False)
def test_request_show_source_buildstatus(self):
self.assertEqual(self.config["request_show_source_buildstatus"], False)
def test_review_inherit_group(self):
self.assertEqual(self.config["review_inherit_group"], False)
def test_submitrequest_accepted_template(self):
self.assertEqual(self.config["submitrequest_accepted_template"], "bla bla")
def test_submitrequest_declined_template(self):
self.assertEqual(self.config["submitrequest_declined_template"], "bla bla")
def test_linkcontrol(self):
self.assertEqual(self.config["linkcontrol"], False)
def test_include_request_from_project(self):
self.assertEqual(self.config["include_request_from_project"], True)
def test_local_service_run(self):
self.assertEqual(self.config["local_service_run"], True)
def test_maintained_attribute(self):
self.assertEqual(self.config["maintained_attribute"], "OBS:Maintained")
def test_maintenance_attribute(self):
self.assertEqual(self.config["maintenance_attribute"], "OBS:MaintenanceProject")
def test_maintained_update_project_attribute(self):
self.assertEqual(self.config["maintained_update_project_attribute"], "OBS:UpdateProject")
def test_show_download_progress(self):
self.assertEqual(self.config["show_download_progress"], False)
def test_vc_cmd(self):
self.assertEqual(self.config["vc-cmd"], "/usr/lib/build/vc")
def test_status_mtime_heuristic(self):
self.assertEqual(self.config["status_mtime_heuristic"], False)
def test_host_option_user(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["user"], "Admin")
def test_host_option_pass(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["pass"], "opensuse")
def test_host_option_http_headers(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(
host_options["http_headers"],
[("authorization", "Basic QWRtaW46b3BlbnN1c2U=")],
)
def test_host_option_realname(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["realname"], "The Administrator")
def test_host_option_email(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["email"], "admin@example.com")
def test_host_option_sslcertck(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["sslcertck"], True)
def test_host_option_cafile(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["cafile"], "unused")
def test_host_option_capath(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["capath"], "unused")
def test_host_option_sshkey(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["sshkey"], "~/.ssh/id_rsa.pub")
def test_host_option_credentials_mgr_class(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(
host_options["credentials_mgr_class"],
"osc.credentials.PlaintextConfigFileCredentialsManager",
)
def test_host_option_allow_http(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["allow_http"], False)
def test_host_option_trusted_prj(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["trusted_prj"], ["openSUSE:*", "SUSE:*"])
def test_host_option_downloadurl(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["downloadurl"], "http://example.com/")
def test_host_option_disable_hdrmd5_check(self):
host_options = self.config["api_host_options"][self.config["apiurl"]]
self.assertEqual(host_options["disable_hdrmd5_check"], False)
if __name__ == "__main__":