From 5af19af190c1fb0f0c5be029d46d63e657dde4d9 Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Thu, 21 Jan 2016 03:57:44 -0500 Subject: Commit partial merge so I can work on the plane --- gerber/tests/test_cam.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gerber/tests/test_cam.py') 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', -- cgit