File: fix-pytest-gte-4-0.patch

package info (click to toggle)
doit 0.31.1-3.3
  • links: PTS, VCS
  • area: main
  • in suites: bookworm, bullseye
  • size: 1,580 kB
  • sloc: python: 10,832; makefile: 168; ansic: 14; sh: 4
file content (50 lines) | stat: -rw-r--r-- 1,758 bytes parent folder | download
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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
Index: doit/dev_requirements.txt
===================================================================
--- doit.orig/dev_requirements.txt
+++ doit/dev_requirements.txt
@@ -2,7 +2,7 @@
 # $ pip install --requirement dev_requirements.txt
 
 pyflakes
-pytest>=2.8.0
+pytest>=4.0
 pytest-ignore-flaky
 coverage>=4.0
 doit-py>=0.4.0
Index: doit/dodo.py
===================================================================
--- doit.orig/dodo.py
+++ doit/dodo.py
@@ -29,7 +29,7 @@ def task_pyflakes():
     yield flaker.tasks('tests/*.py')
 
 def run_test(test):
-    return not bool(pytest.main(test))
+    return not bool(pytest.main([test]))
     #return not bool(pytest.main("-v " + test))
 def task_ut():
     """run unit-tests"""
Index: doit/tests/test_dependency.py
===================================================================
--- doit.orig/tests/test_dependency.py
+++ doit/tests/test_dependency.py
@@ -13,7 +13,7 @@ from doit.dependency import DbmDB, JsonD
 from doit.dependency import DatabaseException, UptodateCalculator
 from doit.dependency import FileChangedChecker, MD5Checker, TimestampChecker
 from doit.dependency import DependencyStatus
-from .conftest import get_abspath, dep_manager
+from .conftest import get_abspath
 
 #path to test folder
 TEST_PATH = os.path.dirname(__file__)
@@ -67,8 +67,8 @@ def test_sqlite_import():
 # create a separate fixture to be used only by this module
 # because only here it is required to test with all backends
 @pytest.fixture(params=[JsonDB, DbmDB, SqliteDB])
-def pdep_manager(request):
-    return dep_manager(request)
+def pdep_manager(dep_manager):
+    return dep_manager
 
 # FIXME there was major refactor breaking classes from dependency,
 # unit-tests could be more specific to base classes.