diff options
| author | Hamilton Kibbe <hamilton.kibbe@gmail.com> | 2016-11-05 20:56:47 -0400 |
|---|---|---|
| committer | Hamilton Kibbe <hamilton.kibbe@gmail.com> | 2016-11-05 20:56:47 -0400 |
| commit | 724c2b3bced319ed0b50c4302fed9b0e1aa9ce9c (patch) | |
| tree | 41cc372eb5897b95d3c08c733e82fd7241eb9524 /gerber/tests/test_cam.py | |
| parent | 5af19af190c1fb0f0c5be029d46d63e657dde4d9 (diff) | |
| download | gerbonara-724c2b3bced319ed0b50c4302fed9b0e1aa9ce9c.tar.gz gerbonara-724c2b3bced319ed0b50c4302fed9b0e1aa9ce9c.tar.bz2 gerbonara-724c2b3bced319ed0b50c4302fed9b0e1aa9ce9c.zip | |
Finish Merge, most tests passing
Diffstat (limited to 'gerber/tests/test_cam.py')
| -rw-r--r-- | gerber/tests/test_cam.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/gerber/tests/test_cam.py b/gerber/tests/test_cam.py index a557e8c..ba5e99d 100644 --- a/gerber/tests/test_cam.py +++ b/gerber/tests/test_cam.py @@ -116,33 +116,22 @@ 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) - + # degrees kelvin isn't a valid unit for a CAM file assert_raises(ValueError, FileSettings, 'absolute', 'degrees kelvin', None, (2, 5), None) - + assert_raises(ValueError, FileSettings, 'absolute', 'inch', 'leading', (2, 5), 'leading') - + # Technnically this should be an error, but Eangle files often do this incorrectly so we # allow it #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', |