update unit tests

This commit is contained in:
Mike McLean 2018-02-28 12:20:37 -05:00
parent 3dda2f5dbf
commit 082f43ba3a
7 changed files with 47 additions and 46 deletions

View file

@ -1,8 +1,8 @@
{
"name": "ROOTNAME",
"arch": "x86_64",
"managed": false,
"managed": False,
"repoid": 99,
"tag_name": "TAG",
"internal_dev_setup": false
"internal_dev_setup": False
}

View file

@ -1,24 +1,24 @@
# Auto-generated by the Koji build system
config_opts['chroothome'] = '/builddir'
config_opts['use_host_resolv'] = False
config_opts['basedir'] = '/var/lib/mock'
config_opts['rpmbuild_timeout'] = 86400
config_opts['yum.conf'] = u'[main]\ncachedir=/var/cache/yum\ndebuglevel=1\nlogfile=/var/log/yum.log\nreposdir=/dev/null\nretries=20\nobsoletes=1\ngpgcheck=0\nassumeyes=1\nkeepcache=1\ninstall_weak_deps=0\nstrict=1\n\n# repos\n\n[build]\nname=build\nbaseurl=file:///mnt/koji/repos/TAG/99/x86_64\n'
config_opts['chroot_setup_cmd'] = 'groupinstall build'
config_opts['target_arch'] = u'x86_64'
config_opts['root'] = u'ROOTNAME'
config_opts['chroothome'] = '/builddir'
config_opts['internal_dev_setup'] = False
config_opts['root'] = 'ROOTNAME'
config_opts['rpmbuild_timeout'] = 86400
config_opts['target_arch'] = 'x86_64'
config_opts['use_host_resolv'] = False
config_opts['yum.conf'] = '[main]\ncachedir=/var/cache/yum\ndebuglevel=1\nlogfile=/var/log/yum.log\nreposdir=/dev/null\nretries=20\nobsoletes=1\ngpgcheck=0\nassumeyes=1\nkeepcache=1\ninstall_weak_deps=0\nstrict=1\n\n# repos\n\n[build]\nname=build\nbaseurl=file:///mnt/koji/repos/TAG/99/x86_64\n'
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['plugin_conf']['root_cache_enable'] = False
config_opts['plugin_conf']['yum_cache_enable'] = False
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['internal_dev_setup'] = False
config_opts['macros']['%_host'] = u'x86_64-koji-linux-gnu'
config_opts['macros']['%_host_cpu'] = u'x86_64'
config_opts['macros']['%vendor'] = 'Koji'
config_opts['macros']['%distribution'] = 'Unknown'
config_opts['macros']['%_topdir'] = '/builddir/build'
config_opts['macros']['%_host'] = 'x86_64-koji-linux-gnu'
config_opts['macros']['%_host_cpu'] = 'x86_64'
config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
config_opts['macros']['%_topdir'] = '/builddir/build'
config_opts['macros']['%distribution'] = 'Unknown'
config_opts['macros']['%packager'] = 'Koji'
config_opts['macros']['%vendor'] = 'Koji'

View file

@ -1,8 +1,8 @@
{
"name": "ROOTNAME",
"arch": "x86_64",
"managed": false,
"managed": False,
"repoid": 99,
"tag_name": "TAG",
"internal_dev_setup": true
"internal_dev_setup": True
}

View file

@ -1,24 +1,24 @@
# Auto-generated by the Koji build system
config_opts['chroothome'] = '/builddir'
config_opts['use_host_resolv'] = False
config_opts['basedir'] = '/var/lib/mock'
config_opts['rpmbuild_timeout'] = 86400
config_opts['yum.conf'] = u'[main]\ncachedir=/var/cache/yum\ndebuglevel=1\nlogfile=/var/log/yum.log\nreposdir=/dev/null\nretries=20\nobsoletes=1\ngpgcheck=0\nassumeyes=1\nkeepcache=1\ninstall_weak_deps=0\nstrict=1\n\n# repos\n\n[build]\nname=build\nbaseurl=file:///mnt/koji/repos/TAG/99/x86_64\n'
config_opts['chroot_setup_cmd'] = 'groupinstall build'
config_opts['target_arch'] = u'x86_64'
config_opts['root'] = u'ROOTNAME'
config_opts['chroothome'] = '/builddir'
config_opts['internal_dev_setup'] = True
config_opts['root'] = 'ROOTNAME'
config_opts['rpmbuild_timeout'] = 86400
config_opts['target_arch'] = 'x86_64'
config_opts['use_host_resolv'] = False
config_opts['yum.conf'] = '[main]\ncachedir=/var/cache/yum\ndebuglevel=1\nlogfile=/var/log/yum.log\nreposdir=/dev/null\nretries=20\nobsoletes=1\ngpgcheck=0\nassumeyes=1\nkeepcache=1\ninstall_weak_deps=0\nstrict=1\n\n# repos\n\n[build]\nname=build\nbaseurl=file:///mnt/koji/repos/TAG/99/x86_64\n'
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['plugin_conf']['root_cache_enable'] = False
config_opts['plugin_conf']['yum_cache_enable'] = False
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['internal_dev_setup'] = True
config_opts['macros']['%_host'] = u'x86_64-koji-linux-gnu'
config_opts['macros']['%_host_cpu'] = u'x86_64'
config_opts['macros']['%vendor'] = 'Koji'
config_opts['macros']['%distribution'] = 'Unknown'
config_opts['macros']['%_topdir'] = '/builddir/build'
config_opts['macros']['%_host'] = 'x86_64-koji-linux-gnu'
config_opts['macros']['%_host_cpu'] = 'x86_64'
config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
config_opts['macros']['%_topdir'] = '/builddir/build'
config_opts['macros']['%distribution'] = 'Unknown'
config_opts['macros']['%packager'] = 'Koji'
config_opts['macros']['%vendor'] = 'Koji'

View file

@ -1,7 +1,7 @@
{
"name": "ROOTNAME",
"arch": "x86_64",
"managed": false,
"managed": False,
"repoid": 99,
"tag_name": "TAG"
}

View file

@ -1,23 +1,23 @@
# Auto-generated by the Koji build system
config_opts['chroothome'] = '/builddir'
config_opts['use_host_resolv'] = False
config_opts['basedir'] = '/var/lib/mock'
config_opts['rpmbuild_timeout'] = 86400
config_opts['yum.conf'] = u'[main]\ncachedir=/var/cache/yum\ndebuglevel=1\nlogfile=/var/log/yum.log\nreposdir=/dev/null\nretries=20\nobsoletes=1\ngpgcheck=0\nassumeyes=1\nkeepcache=1\ninstall_weak_deps=0\nstrict=1\n\n# repos\n\n[build]\nname=build\nbaseurl=file:///mnt/koji/repos/TAG/99/x86_64\n'
config_opts['chroot_setup_cmd'] = 'groupinstall build'
config_opts['target_arch'] = u'x86_64'
config_opts['root'] = u'ROOTNAME'
config_opts['chroothome'] = '/builddir'
config_opts['root'] = 'ROOTNAME'
config_opts['rpmbuild_timeout'] = 86400
config_opts['target_arch'] = 'x86_64'
config_opts['use_host_resolv'] = False
config_opts['yum.conf'] = '[main]\ncachedir=/var/cache/yum\ndebuglevel=1\nlogfile=/var/log/yum.log\nreposdir=/dev/null\nretries=20\nobsoletes=1\ngpgcheck=0\nassumeyes=1\nkeepcache=1\ninstall_weak_deps=0\nstrict=1\n\n# repos\n\n[build]\nname=build\nbaseurl=file:///mnt/koji/repos/TAG/99/x86_64\n'
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['plugin_conf']['root_cache_enable'] = False
config_opts['plugin_conf']['yum_cache_enable'] = False
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['macros']['%_host'] = u'x86_64-koji-linux-gnu'
config_opts['macros']['%_host_cpu'] = u'x86_64'
config_opts['macros']['%vendor'] = 'Koji'
config_opts['macros']['%distribution'] = 'Unknown'
config_opts['macros']['%_topdir'] = '/builddir/build'
config_opts['macros']['%_host'] = 'x86_64-koji-linux-gnu'
config_opts['macros']['%_host_cpu'] = 'x86_64'
config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
config_opts['macros']['%_topdir'] = '/builddir/build'
config_opts['macros']['%distribution'] = 'Unknown'
config_opts['macros']['%packager'] = 'Koji'
config_opts['macros']['%vendor'] = 'Koji'

View file

@ -1,4 +1,4 @@
import json
import ast
import os
import os.path
import unittest
@ -14,11 +14,12 @@ class TestGenMockConfig(unittest.TestCase):
datadir = os.path.join(os.path.dirname(__file__), 'data/mock')
count = 0
for fn in os.listdir(datadir):
if not fn.endswith('.json'):
if not fn.endswith('.data'):
continue
path = os.path.join(datadir, fn)
with open(path) as fo:
params = json.load(fo)
s = fo.read()
params = ast.literal_eval(s)
with open(path[:-5] + '.out') as fo:
expected = fo.read()
output = koji.genMockConfig(**params)