summaryrefslogtreecommitdiff
path: root/dev-python/pslab/files/pslab-3.0.0-pytest_record.patch
blob: 90d5448998a8fdda630d215c4dffe17533cd4833 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
Now that dev-python/pslab indirectly depends on pytest-reserial
(it is a test dependency of dev-python/mcbootflash), the option name --record
produces a collision.

--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -8,9 +8,9 @@
 Additionally, certain pins must be connected in a specific manner. Refer to the
 individual test modules in the tests package.
 
-By calling pytest with the --record flag, the serial traffic generated by the
+By calling pytest with the --record-serial flag, the serial traffic generated by the
 integration tests will be recorded to JSON files, which are played back during
-unit testing. The --record flag implies --integration.
+unit testing. The --record-serial flag implies --integration.
 """
 
 import json
@@ -23,7 +23,7 @@
 
 def pytest_addoption(parser):
     parser.addoption("--integration", action="store_true", default=False)
-    parser.addoption("--record", action="store_true", default=False)
+    parser.addoption("--record-serial", action="store_true", default=False)
 
 
 @pytest.fixture(scope="module")
@@ -38,7 +38,7 @@
 
     When running unit tests, the SerialHandler is a MockHandler.
     """
-    record = request.config.getoption("--record")
+    record = request.config.getoption("--record-serial")
     integration = request.config.getoption("--integration") or record
     logfile = os.path.join(logdir, request.node.name + ".json")