CInema: Migrate to using ini manifests
Vicki Pfau vi@endrift.com
Tue, 16 Jun 2020 18:18:34 -0700
66 files changed,
109 insertions(+),
66 deletions(-)
jump to
A
cinema/gb/mooneye-gb/acceptance/boot_div-S/config.ini
@@ -0,0 +1,5 @@
+[testinfo] +fail=1 + +[ports.cinema] +gb.model=SGB
D
cinema/gb/mooneye-gb/acceptance/boot_div-S/manifest.yml
@@ -1,3 +0,0 @@
-config: - gb.model: SGB -fail: true
A
cinema/gb/mooneye-gb/acceptance/boot_div2-S/config.ini
@@ -0,0 +1,5 @@
+[testinfo] +fail=1 + +[ports.cinema] +gb.model=SGB
D
cinema/gb/mooneye-gb/acceptance/boot_div2-S/manifest.yml
@@ -1,3 +0,0 @@
-config: - gb.model: SGB -fail: true
A
cinema/gb/mooneye-gb/acceptance/boot_hwio-S/config.ini
@@ -0,0 +1,2 @@
+[ports.cinema] +gb.model=SGB
A
cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/config.ini
@@ -0,0 +1,2 @@
+[ports.cinema] +gb.model=MGB
D
cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/manifest.yml
@@ -1,2 +0,0 @@
-config: - gb.model: MGB
A
cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/config.ini
@@ -0,0 +1,2 @@
+[ports.cinema] +gb.model=SGB
D
cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/manifest.yml
@@ -1,2 +0,0 @@
-config: - gb.model: SGB
A
cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/config.ini
@@ -0,0 +1,2 @@
+[ports.cinema] +gb.model=SGB2
D
cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/manifest.yml
@@ -1,2 +0,0 @@
-config: - gb.model: SGB2
A
cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/config.ini
@@ -0,0 +1,2 @@
+[testinfo] +fail=1
D
cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/manifest.yml
@@ -1,1 +0,0 @@
-fail: true
A
cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/config.ini
@@ -0,0 +1,2 @@
+[testinfo] +fail=1
D
cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/manifest.yml
@@ -1,1 +0,0 @@
-fail: true
A
cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/config.ini
@@ -0,0 +1,2 @@
+[testinfo] +fail=1
D
cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/manifest.yml
@@ -1,1 +0,0 @@
-fail: true
A
cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/config.ini
@@ -0,0 +1,2 @@
+[testinfo] +fail=1
D
cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/manifest.yml
@@ -1,1 +0,0 @@
-fail: true
A
cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/config.ini
@@ -0,0 +1,2 @@
+[testinfo] +fail=1
A
cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/config.ini
@@ -0,0 +1,2 @@
+[testinfo] +fail=1
D
cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/manifest.yml
@@ -1,1 +0,0 @@
-fail: true
A
cinema/gb/mooneye-gb/config.ini
@@ -0,0 +1,6 @@
+[testinfo] +skip=60 +frames=1 + +[ports.cinema] +sgb.borders=0
A
cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/config.ini
@@ -0,0 +1,2 @@
+[testinfo] +fail=1
D
cinema/gb/mooneye-gb/manifest.yml
@@ -1,4 +0,0 @@
-skip: 60 -frames: 1 -config: - sgb.borders: false
A
cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/config.ini
@@ -0,0 +1,5 @@
+[testinfo] +fail=1 + +[ports.cinema] +gb.model=CGB
D
cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/manifest.yml
@@ -1,3 +0,0 @@
-config: - gb.model: CGB -fail: true
A
cinema/gb/mooneye-gb/misc/boot_div-A/config.ini
@@ -0,0 +1,5 @@
+[testinfo] +fail=1 + +[ports.cinema] +gb.model=AGB
D
cinema/gb/mooneye-gb/misc/boot_div-A/manifest.yml
@@ -1,3 +0,0 @@
-config: - gb.model: AGB -fail: true
A
cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/config.ini
@@ -0,0 +1,5 @@
+[testinfo] +fail=1 + +[ports.cinema] +gb.model=CGB
A
cinema/gb/mooneye-gb/misc/boot_hwio-C/config.ini
@@ -0,0 +1,5 @@
+[testinfo] +fail=1 + +[ports.cinema] +gb.model=CGB
D
cinema/gb/mooneye-gb/misc/boot_hwio-C/manifest.yml
@@ -1,3 +0,0 @@
-config: - gb.model: CGB -fail: true
A
cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/config.ini
@@ -0,0 +1,5 @@
+[testinfo] +fail=1 + +[ports.cinema] +gb.model=CGB
D
cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/manifest.yml
@@ -1,3 +0,0 @@
-config: - gb.model: CGB -fail: true
M
src/platform/python/cinema/test.py
→
src/platform/python/cinema/test.py
@@ -6,10 +6,10 @@ import cinema.movie
import itertools import glob import re -import yaml from copy import deepcopy from cinema import VideoFrame from cinema.util import dict_merge +from configparser import ConfigParser class CinemaTest(object):@@ -22,8 +22,15 @@ self.root = root
self.name = '.'.join(path) self.settings = settings try: - with open(os.path.join(self.path, 'manifest.yml'), 'r') as f: - dict_merge(self.settings, yaml.safe_load(f)) + with open(os.path.join(self.path, 'config.ini'), 'r') as f: + cfg = ConfigParser() + cfg.read_file(f) + settings = {} + if 'testinfo' in cfg: + settings = dict(cfg['testinfo']) + if 'ports.cinema' in cfg: + settings['config'] = dict(cfg['ports.cinema']) + dict_merge(self.settings, settings) except IOError: pass self.tests = {}@@ -49,9 +56,9 @@
def output_settings(self): output_settings = {} if 'frames' in self.settings: - output_settings['limit'] = self.settings['frames'] + output_settings['limit'] = int(self.settings['frames']) if 'skip' in self.settings: - output_settings['skip'] = self.settings['skip'] + output_settings['skip'] = int(self.settings['skip']) return output_settings def __lt__(self, other):
M
src/platform/python/conftest.py
→
src/platform/python/conftest.py
@@ -3,7 +3,7 @@ import itertools
import os import os.path import pytest -import yaml +from configparser import ConfigParser def pytest_addoption(parser): parser.addoption("--rebaseline", action="store_true", help="output a new baseline instead of testing")@@ -39,11 +39,12 @@ diff.save(os.path.join(outdir, DIFF % i))
diffNorm.save(os.path.join(outdir, DIFF_NORM % i)) if node.config.getoption("--mark-failing"): + settings = ConfigParser() try: - with open(os.path.join(vtest.path, 'manifest.yml'), 'r') as f: - settings = yaml.safe_load(f) + with open(os.path.join(vtest.path, 'config.ini'), 'r') as f: + settings.read_file(f) except IOError: - settings = {} - settings['fail'] = True - with open(os.path.join(vtest.path, 'manifest.yml'), 'w') as f: - yaml.dump(settings, f, default_flow_style=False) + pass + settings.set('testinfo', 'fail', '1') + with open(os.path.join(vtest.path, 'config.ini'), 'w') as f: + settings.write(f)
M
src/platform/python/setup.py
→
src/platform/python/setup.py
@@ -23,7 +23,7 @@ url="http://github.com/mgba-emu/mgba/",
packages=["mgba"], setup_requires=['cffi>=1.6', 'pytest-runner'], install_requires=['cffi>=1.6', 'cached-property'], - extras_require={'pil': ['Pillow>=2.3'], 'cinema': ['pyyaml', 'pytest']}, + extras_require={'pil': ['Pillow>=2.3'], 'cinema': ['pytest']}, tests_require=['pytest'], cffi_modules=["_builder.py:ffi"], license="MPL 2.0",
M
src/platform/python/test_cinema.py
→
src/platform/python/test_cinema.py
@@ -24,7 +24,7 @@ params = []
for test in testList: marks = [] xfail = test.settings.get('fail') - if xfail: + if xfail and bool(xfail): marks = pytest.mark.xfail(reason=xfail if isinstance(xfail, str) else None) params.append(pytest.param(test, id=test.name, marks=marks)) metafunc.parametrize('vtest', params, indirect=True)