diff options
| author | Garret Fick <garret@ficksworkshop.com> | 2016-08-06 09:51:58 +0800 |
|---|---|---|
| committer | Garret Fick <garret@ficksworkshop.com> | 2016-08-06 09:51:58 +0800 |
| commit | 8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410 (patch) | |
| tree | 8415fede2e664716a5b3a09fbb4c09baca78bcf8 /gerber/tests/test_primitives.py | |
| parent | 8cd842a41a55ab3d8f558a2e3e198beba7da58a1 (diff) | |
| download | gerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.tar.gz gerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.tar.bz2 gerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.zip | |
Fix multiple problems with the merge. There are still errors, but I will intentionally leave them because future merges might resolve them
Diffstat (limited to 'gerber/tests/test_primitives.py')
| -rw-r--r-- | gerber/tests/test_primitives.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gerber/tests/test_primitives.py b/gerber/tests/test_primitives.py index 261e6ef..e23d5f4 100644 --- a/gerber/tests/test_primitives.py +++ b/gerber/tests/test_primitives.py @@ -10,15 +10,13 @@ from .tests import * def test_primitive_smoketest(): p = Primitive() -<<<<<<< HEAD try: p.bounding_box assert_false(True, 'should have thrown the exception') except NotImplementedError: pass -======= #assert_raises(NotImplementedError, p.bounding_box) ->>>>>>> 5476da8... Fix a bunch of rendering bugs. + p.to_metric() p.to_inch() try: |