diff options
| author | Hamilton Kibbe <hamilton.kibbe@gmail.com> | 2016-01-21 03:57:44 -0500 |
|---|---|---|
| committer | Garret Fick <garret@ficksworkshop.com> | 2016-09-24 02:28:36 +0800 |
| commit | 5af19af190c1fb0f0c5be029d46d63e657dde4d9 (patch) | |
| tree | dd60a0b21e1d1ca7258b9f978ce973354d96062c /gerber/tests/test_cam.py | |
| parent | 8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410 (diff) | |
| download | gerbonara-5af19af190c1fb0f0c5be029d46d63e657dde4d9.tar.gz gerbonara-5af19af190c1fb0f0c5be029d46d63e657dde4d9.tar.bz2 gerbonara-5af19af190c1fb0f0c5be029d46d63e657dde4d9.zip | |
Commit partial merge so I can work on the plane
Diffstat (limited to 'gerber/tests/test_cam.py')
| -rw-r--r-- | gerber/tests/test_cam.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gerber/tests/test_cam.py b/gerber/tests/test_cam.py index 24f2b9b..a557e8c 100644 --- a/gerber/tests/test_cam.py +++ b/gerber/tests/test_cam.py @@ -116,6 +116,7 @@ def test_zeros(): def test_filesettings_validation(): """ Test FileSettings constructor argument validation """ +<<<<<<< HEAD # absolute-ish is not a valid notation assert_raises(ValueError, FileSettings, 'absolute-ish', 'inch', None, (2, 5), None) @@ -132,6 +133,16 @@ def test_filesettings_validation(): #assert_raises(ValueError, FileSettings, 'absolute', # 'inch', 'following', (2, 5), None) +======= + assert_raises(ValueError, FileSettings, 'absolute-ish', + 'inch', None, (2, 5), None) + assert_raises(ValueError, FileSettings, 'absolute', + 'degrees kelvin', None, (2, 5), None) + assert_raises(ValueError, FileSettings, 'absolute', + 'inch', 'leading', (2, 5), 'leading') + assert_raises(ValueError, FileSettings, 'absolute', + 'inch', 'following', (2, 5), None) +>>>>>>> 5476da8... Fix a bunch of rendering bugs. assert_raises(ValueError, FileSettings, 'absolute', 'inch', None, (2, 5), 'following') assert_raises(ValueError, FileSettings, 'absolute', |