Skip to content

Commit 7799896

Browse files
committed
Merge from fsipact/pypact master for printlib5 commit
1 parent 5fa05c5 commit 7799896

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

pytest.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[pytest]
22
# addopts = --cov-config .coveragerc --cov=./pypact --ignore setup.py --color=yes
3-
addopts = --ignore setup.py --color=yes
3+
addopts = --ignore setup.py --ignore tests/testsuite.py --ignore tests/testerbase.py--color=yes
44
python_files = test*.py *test.py
55
norecursedirs = .* build dist {arch} *.egg data out .wrk
66
testpaths = tests

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
test_suite='tests.testsuite',
3030
tests_require=[
3131
'pytest',
32+
'pytest-cov>=2.3.1',
3233
'mock',
3334
'jsonschema',
3435
],

tests/output/test_json_schema_compatibility.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import os
22
import pytest
3-
import pypact as pp
43
import json
54
from jsonschema import validate, ValidationError
5+
import pypact as pp
6+
from pypact.filerecord import InventoryFileRecord as FileRecord
7+
68

79
from tests.testerbase import REFERENCE_DIR
810

@@ -22,7 +24,7 @@
2224
])
2325
def test_timestep_reads_dpa_and_time(fispact_out_file_name):
2426
data_file_name = os.path.join(REFERENCE_DIR, fispact_out_file_name)
25-
filerecord = pp.FileRecord(data_file_name)
27+
filerecord = FileRecord(data_file_name)
2628
output = pp.Output()
2729
output.fispact_deserialize(filerecord)
2830
json_text = output.json_serialize()

tests/output/test_reading_timestep_with_dpa.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import os
2-
import pypact as pp
32
import pytest
43

4+
from pypact.filerecord import InventoryFileRecord as FileRecord
5+
56
from tests.testerbase import REFERENCE_DIR
67
from pypact.output.timestep import TimeStep
78

89
data_file_name = os.path.join(REFERENCE_DIR, "test_dpa.out")
9-
filerecord = pp.FileRecord(data_file_name)
10+
filerecord = FileRecord(data_file_name)
1011

1112

1213
@pytest.mark.parametrize("interval, duration, total_displacement_rate", [

0 commit comments

Comments
 (0)