Skip to content

Commit 3bd5375

Browse files
committed
Adapted to pytest framework
1 parent 6d15b71 commit 3bd5375

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

test/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,4 @@ api_config = config_utils.get_nested_config("easyPerf.api")
176176
2. Apply appropriate tags
177177
3. Naming: `test_*.py`
178178
4. Use fixtures & marks for data management
179-
<<<<<<< HEAD
180179
5. Keep custom marks concise and aligned with overall goals
181-
=======
182-
5. Keep custom marks concise and aligned with overall goals
183-
>>>>>>> f01918a (Adapted to pytest framework)

test/requirements.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
pytest>=7.0.0
22
pytest-html>=3.1.1
33
PyYAML>=6.0
4-
<<<<<<< HEAD
54
# MySQL
65
peewee>=3.14.5
76
pymysql>=1.0.2
8-
=======
9-
pandas>=2.0.0
10-
pydantic>=2.0.0
11-
# MySQL
12-
peewee>=3.14.5
13-
pymysql>=1.0.2
14-
>>>>>>> f01918a (Adapted to pytest framework)

0 commit comments

Comments
 (0)