summaryrefslogtreecommitdiff
path: root/gerber/tests/test_common.py
diff options
context:
space:
mode:
authorChintalagiri Shashank <shashank.chintalagiri@gmail.com>2019-11-27 15:11:27 +0530
committerChintalagiri Shashank <shashank.chintalagiri@gmail.com>2019-11-27 15:11:27 +0530
commit5288a8314b535d455e8635ee9a3a537cd795845b (patch)
tree4233452d40a23ab99d0aab5f977e63df632d3c70 /gerber/tests/test_common.py
parent25b82c988578482fbb57f80d3d30bdf985a9a885 (diff)
parent0024c0b045a29621845f4f1b5ee1283e32e38887 (diff)
downloadgerbonara-5288a8314b535d455e8635ee9a3a537cd795845b.tar.gz
gerbonara-5288a8314b535d455e8635ee9a3a537cd795845b.tar.bz2
gerbonara-5288a8314b535d455e8635ee9a3a537cd795845b.zip
Manual merge resolution
Diffstat (limited to 'gerber/tests/test_common.py')
-rw-r--r--gerber/tests/test_common.py23
1 files changed, 10 insertions, 13 deletions
diff --git a/gerber/tests/test_common.py b/gerber/tests/test_common.py
index 0224c48..a6b1264 100644
--- a/gerber/tests/test_common.py
+++ b/gerber/tests/test_common.py
@@ -6,15 +6,12 @@ from ..exceptions import ParseError
from ..common import read, loads
from ..excellon import ExcellonFile
from ..rs274x import GerberFile
-from .tests import *
-
import os
+import pytest
-NCDRILL_FILE = os.path.join(os.path.dirname(__file__),
- 'resources/ncdrill.DRD')
-TOP_COPPER_FILE = os.path.join(os.path.dirname(__file__),
- 'resources/top_copper.GTL')
+NCDRILL_FILE = os.path.join(os.path.dirname(__file__), "resources/ncdrill.DRD")
+TOP_COPPER_FILE = os.path.join(os.path.dirname(__file__), "resources/top_copper.GTL")
def test_file_type_detection():
@@ -22,20 +19,20 @@ def test_file_type_detection():
"""
ncdrill = read(NCDRILL_FILE)
top_copper = read(TOP_COPPER_FILE)
- assert_true(isinstance(ncdrill, ExcellonFile))
- assert_true(isinstance(top_copper, GerberFile))
+ assert isinstance(ncdrill, ExcellonFile)
+ assert isinstance(top_copper, GerberFile)
def test_load_from_string():
- with open(NCDRILL_FILE, 'rU') as f:
+ with open(NCDRILL_FILE, "rU") as f:
ncdrill = loads(f.read())
- with open(TOP_COPPER_FILE, 'rU') as f:
+ with open(TOP_COPPER_FILE, "rU") as f:
top_copper = loads(f.read())
- assert_true(isinstance(ncdrill, ExcellonFile))
- assert_true(isinstance(top_copper, GerberFile))
+ assert isinstance(ncdrill, ExcellonFile)
+ assert isinstance(top_copper, GerberFile)
def test_file_type_validation():
""" Test file format validation
"""
- assert_raises(ParseError, read, __file__)
+ pytest.raises(ParseError, read, __file__)