From 082f43ba3a5e51879f66ac7ac5c1bf4e35e10630 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Feb 28 2018 17:22:05 +0000 Subject: update unit tests --- diff --git a/tests/test_lib/data/mock/internaldev.data b/tests/test_lib/data/mock/internaldev.data new file mode 100644 index 0000000..7feae56 --- /dev/null +++ b/tests/test_lib/data/mock/internaldev.data @@ -0,0 +1,8 @@ +{ + "name": "ROOTNAME", + "arch": "x86_64", + "managed": False, + "repoid": 99, + "tag_name": "TAG", + "internal_dev_setup": False +} diff --git a/tests/test_lib/data/mock/internaldev.json b/tests/test_lib/data/mock/internaldev.json deleted file mode 100644 index 36ab93f..0000000 --- a/tests/test_lib/data/mock/internaldev.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "ROOTNAME", - "arch": "x86_64", - "managed": false, - "repoid": 99, - "tag_name": "TAG", - "internal_dev_setup": false -} diff --git a/tests/test_lib/data/mock/internaldev.out b/tests/test_lib/data/mock/internaldev.out index 609de88..a9bd710 100644 --- a/tests/test_lib/data/mock/internaldev.out +++ b/tests/test_lib/data/mock/internaldev.out @@ -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' diff --git a/tests/test_lib/data/mock/internaldev2.data b/tests/test_lib/data/mock/internaldev2.data new file mode 100644 index 0000000..e1b3f08 --- /dev/null +++ b/tests/test_lib/data/mock/internaldev2.data @@ -0,0 +1,8 @@ +{ + "name": "ROOTNAME", + "arch": "x86_64", + "managed": False, + "repoid": 99, + "tag_name": "TAG", + "internal_dev_setup": True +} diff --git a/tests/test_lib/data/mock/internaldev2.json b/tests/test_lib/data/mock/internaldev2.json deleted file mode 100644 index 2c9a5c6..0000000 --- a/tests/test_lib/data/mock/internaldev2.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "ROOTNAME", - "arch": "x86_64", - "managed": false, - "repoid": 99, - "tag_name": "TAG", - "internal_dev_setup": true -} diff --git a/tests/test_lib/data/mock/internaldev2.out b/tests/test_lib/data/mock/internaldev2.out index f5d7d69..034dc79 100644 --- a/tests/test_lib/data/mock/internaldev2.out +++ b/tests/test_lib/data/mock/internaldev2.out @@ -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' diff --git a/tests/test_lib/data/mock/simple.data b/tests/test_lib/data/mock/simple.data new file mode 100644 index 0000000..0fdf03d --- /dev/null +++ b/tests/test_lib/data/mock/simple.data @@ -0,0 +1,7 @@ +{ + "name": "ROOTNAME", + "arch": "x86_64", + "managed": False, + "repoid": 99, + "tag_name": "TAG" +} diff --git a/tests/test_lib/data/mock/simple.json b/tests/test_lib/data/mock/simple.json deleted file mode 100644 index d0e1ce5..0000000 --- a/tests/test_lib/data/mock/simple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "ROOTNAME", - "arch": "x86_64", - "managed": false, - "repoid": 99, - "tag_name": "TAG" -} diff --git a/tests/test_lib/data/mock/simple.out b/tests/test_lib/data/mock/simple.out index 9759669..71d5dae 100644 --- a/tests/test_lib/data/mock/simple.out +++ b/tests/test_lib/data/mock/simple.out @@ -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' diff --git a/tests/test_lib/test_gen_mock_config.py b/tests/test_lib/test_gen_mock_config.py index 2d0bc37..9afe1a0 100644 --- a/tests/test_lib/test_gen_mock_config.py +++ b/tests/test_lib/test_gen_mock_config.py @@ -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)