aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2023-04-11 00:40:53 +0200
committerjaseg <git@jaseg.de>2023-04-11 00:40:53 +0200
commit9d7fd8b3b4fbc1e2cfe44259da7e6b16d35234e3 (patch)
tree508bf91c9d79295f919c7b4066547ec57235bee7
parenta02ff5fc87345c4ea490d7621acccad419f6360b (diff)
downloadgerbolyze-9d7fd8b3b4fbc1e2cfe44259da7e6b16d35234e3.tar.gz
gerbolyze-9d7fd8b3b4fbc1e2cfe44259da7e6b16d35234e3.tar.bz2
gerbolyze-9d7fd8b3b4fbc1e2cfe44259da7e6b16d35234e3.zip
Fix failing tests
-rwxr-xr-xgerbolyze/__init__.py2
-rw-r--r--gerbolyze/tests/test_integration.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/gerbolyze/__init__.py b/gerbolyze/__init__.py
index 936821f..e8bb934 100755
--- a/gerbolyze/__init__.py
+++ b/gerbolyze/__init__.py
@@ -420,7 +420,7 @@ def run_cargo_command(binary, *args, **kwargs):
for cand in candidates:
try:
- logging.debug(f'using {binary}: {cand}')
+ logging.debug(f'trying {binary}: {cand}')
logging.debug(f'with args: {" ".join(cmd_args)}')
res = subprocess.run([cand, *cmd_args], check=True)
break
diff --git a/gerbolyze/tests/test_integration.py b/gerbolyze/tests/test_integration.py
index f059504..78e2e36 100644
--- a/gerbolyze/tests/test_integration.py
+++ b/gerbolyze/tests/test_integration.py
@@ -73,8 +73,8 @@ def test_paste():
bottom_overlay = reference_path('tpl-bottom.svg')
with tempfile.TemporaryDirectory() as intermediate_gerbers,\
tempfile.TemporaryDirectory() as output_gerbers:
- run_command('python3', '-m', 'gerbolyze', 'paste', '--no-subtract', in_gerbers, top_overlay, intermediate_gerbers)
- run_command('python3', '-m', 'gerbolyze', 'paste', '--no-subtract', intermediate_gerbers, bottom_overlay, output_gerbers)
+ run_command('python3', '-m', 'gerbolyze', 'paste', '--log-level', 'debug', '--no-subtract', in_gerbers, top_overlay, intermediate_gerbers)
+ run_command('python3', '-m', 'gerbolyze', 'paste', '--log-level', 'debug', '--no-subtract', intermediate_gerbers, bottom_overlay, output_gerbers)
stack_old = gerbonara.layers.LayerStack.open(in_gerbers)
stack_new = gerbonara.layers.LayerStack.open(output_gerbers)
@@ -109,7 +109,7 @@ def test_convert_layers():
'bottom silk': 0.160,
'bottom paste': 0.170,
'mechanical outline': 0.09}.items():
- assert set(round(ap.diameter, 4) for ap in stack[layer].apertures) == {dia, 0.05}
+ assert set(round(ap.diameter, 4) for ap in stack[layer].apertures) == {dia}
# Note: svg-flatten rounds these diameters to the geometric tolerance given on the command line (0.01mm by
# default).