templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed interaction between tests testing eeschema_do version

This commit is contained in:
Salvador E. Tropea 2021-02-03 16:07:36 -03:00
parent 2a93f97abd
commit 2d4f73d822
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_plot/test_misc_2.py
View File

@ -25,6 +25,7 @@ from kibot.bom.columnlist import ColumnList
cov = coverage.Coverage() cov = coverage.Coverage()
mocked_check_output_FNF = True mocked_check_output_FNF = True
mocked_check_output_retOK = '' mocked_check_output_retOK = ''
mocked_call_enabled = False
# Important note: # Important note:
@ -45,8 +46,10 @@ def mocked_check_output(cmd, stderr=None):
def mocked_call(cmd): def mocked_call(cmd):
logging.debug('Forcing fail on '+str(cmd)) if mocked_call_enabled:
return 5 logging.debug('Forcing fail on '+str(cmd))
return 5
return subprocess.call(cmd)
def patch_functions(m): def patch_functions(m):
@ -159,8 +162,6 @@ def test_ibom_parse_fail(test_dir, caplog, monkeypatch):
out = RegOutput.get_class_for('ibom')() out = RegOutput.get_class_for('ibom')()
out.set_tree({}) out.set_tree({})
out.config() out.config()
# Setup the GS output dir, needed for the output path
#GS.out_dir = '.'
with pytest.raises(SystemExit) as pytest_wrapped_e: with pytest.raises(SystemExit) as pytest_wrapped_e:
out.run('') out.run('')
assert pytest_wrapped_e.type == SystemExit assert pytest_wrapped_e.type == SystemExit
@ -198,6 +199,8 @@ def test_bom_no_sch():
def test_pre_xrc_fail(test_dir, caplog, monkeypatch): def test_pre_xrc_fail(test_dir, caplog, monkeypatch):
ctx = context.TestContext(test_dir, 'test_pre_xrc_fail', 'test_v5', 'empty_zip', '') ctx = context.TestContext(test_dir, 'test_pre_xrc_fail', 'test_v5', 'empty_zip', '')
global mocked_call_enabled
mocked_call_enabled = True
with monkeypatch.context() as m: with monkeypatch.context() as m:
patch_functions(m) patch_functions(m)
with context.cover_it(cov): with context.cover_it(cov):
@ -217,3 +220,4 @@ def test_pre_xrc_fail(test_dir, caplog, monkeypatch):
assert e2.type == SystemExit assert e2.type == SystemExit
assert e2.value.code == ERC_ERROR assert e2.value.code == ERC_ERROR
ctx.clean_up() ctx.clean_up()
mocked_call_enabled = False

3
tests/test_plot/test_script_checks.py
View File

@ -15,6 +15,7 @@ if prev_dir not in sys.path:
sys.path.insert(0, prev_dir) sys.path.insert(0, prev_dir)
from kibot.misc import (MISSING_TOOL, CMD_EESCHEMA_DO) from kibot.misc import (MISSING_TOOL, CMD_EESCHEMA_DO)
from kibot.kiplot import (check_script, check_version) from kibot.kiplot import (check_script, check_version)
import kibot.kiplot
cov = coverage.Coverage() cov = coverage.Coverage()
@ -45,6 +46,8 @@ def test_check_version_1(caplog):
def test_check_version_2(caplog): def test_check_version_2(caplog):
# Avoid interaction with other tests: reset the versions cache
kibot.kiplot.script_versions = {}
cov.load() cov.load()
cov.start() cov.start()
with pytest.raises(SystemExit) as pytest_wrapped_e: with pytest.raises(SystemExit) as pytest_wrapped_e: