Skip to content

Commit 1df27a1

Browse files
authored
Merge pull request #23 from mikelolasagasti/fix-TestLoader-addTests
2 parents 154cd0d + 1660e64 commit 1df27a1

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

testscenarios/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_suite():
5757
return testscenarios.tests.test_suite()
5858

5959

60-
def load_tests(standard_tests, module, loader):
60+
def load_tests(loader, standard_tests, pattern):
6161
standard_tests.addTests(loader.loadTestsFromNames(["testscenarios.tests"]))
6262
return standard_tests
6363

testscenarios/tests/__init__.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,18 @@
1515
# limitations under that license.
1616

1717
import doctest
18-
import sys
1918
import unittest
2019

2120
import testscenarios
2221

2322

2423
def test_suite():
25-
standard_tests = unittest.TestSuite()
26-
module = sys.modules["testscenarios.tests"]
2724
loader = unittest.TestLoader()
28-
return load_tests(standard_tests, module, loader)
25+
standard_tests = unittest.TestSuite()
26+
return load_tests(loader, standard_tests, None)
2927

3028

31-
def load_tests(standard_tests, module, loader):
29+
def load_tests(loader, standard_tests, pattern):
3230
test_modules = [
3331
"testcase",
3432
"scenarios",

0 commit comments

Comments
 (0)