Skip to content

Commit 38c5ebf

Browse files
committed
Merge pytest.ini files
1 parent 51fafa2 commit 38c5ebf

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

pytest.ini

Lines changed: 0 additions & 4 deletions
This file was deleted.

test/pytest.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ addopts = --color=yes
33
python_files =
44
test_*.py
55
markers =
6-
slow: tests not completing in a few seconds
6+
slow: tests not completing in a few seconds
7+
timing: mark test as time profiling test
8+
memory: mark test as memory profiling test

0 commit comments

Comments
 (0)