From 6f0c9296586dd367674f3425bc016b948d7601dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
Date: Sat, 27 May 2017 23:40:55 +0200
Subject: [PATCH] Fix unittest.main() parameters. (#1351)

---
 stdlib/2/unittest.pyi | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/stdlib/2/unittest.pyi b/stdlib/2/unittest.pyi
index 52decfedd..1a7a069cd 100644
--- a/stdlib/2/unittest.pyi
+++ b/stdlib/2/unittest.pyi
@@ -4,10 +4,9 @@
 
 # Only a subset of functionality is included.
 
-from typing import (
-    Any, Callable, Dict, Iterable, Tuple, List, TextIO, Sequence,
-    overload, Set, FrozenSet, TypeVar, Union, Pattern, Type
-)
+from typing import (Any, Callable, Dict, FrozenSet, Iterable, List, Optional,
+                    overload, Pattern, Sequence, Set, TextIO, Tuple, Type,
+                    TypeVar, Union)
 from abc import abstractmethod, ABCMeta
 import types
 
@@ -153,11 +152,26 @@ class TestSuite(Testable):
     def debug(self) -> None: ...
     def countTestCases(self) -> int: ...
 
-# TODO TestLoader
-# TODO defaultTestLoader
+class TestLoader:
+    testMethodPrefix = ...  # type: str
+    sortTestMethodsUsing = ...  # type: Optional[Callable[[str, str], int]]
+    suiteClass = ...  # type: Callable[[List[TestCase]], TestSuite]
+    def loadTestsFromTestCase(self,
+                              testCaseClass: Type[TestCase]) -> TestSuite: ...
+    def loadTestsFromModule(self, module: str = ...,
+                            use_load_tests: bool = ...) -> TestSuite: ...
+    def loadTestsFromName(self, name: str = ...,
+                          module: Optional[str] = ...) -> TestSuite: ...
+    def loadTestsFromNames(self, names: List[str] = ...,
+                          module: Optional[str] = ...) -> TestSuite: ...
+    def discover(self, start_dir: str, pattern: str = ...,
+                 top_level_dir: Optional[str] = ...) -> TestSuite: ...
+    def getTestCaseNames(self, testCaseClass: Type[TestCase] = ...) -> List[str]: ...
+
+defaultTestLoader = TestLoader
 
 class TextTestRunner:
-    def __init__(self, stream: TextIO = ..., descriptions: bool = ...,
+    def __init__(self, stream: Optional[TextIO] = ..., descriptions: bool = ...,
                  verbosity: int = ..., failfast: bool = ...) -> None: ...
 
 class SkipTest(Exception):
@@ -169,9 +183,16 @@ def skipIf(condition: Any, reason: Union[str, unicode]) -> Any: ...
 def expectedFailure(func: _FT) -> _FT: ...
 def skip(reason: Union[str, unicode]) -> Any: ...
 
-def main(module: str = ..., defaultTest: str = ...,
-         argv: List[str] = ..., testRunner: Any = ...,
-         testLoader: Any = ...) -> None: ...  # TODO types
+# not really documented
+class TestProgram:
+    result = ...  # type: TestResult
+
+def main(module: str = ..., defaultTest: Optional[str] = ...,
+         argv: Optional[Sequence[str]] = ...,
+         testRunner: Union[Type[TextTestRunner], TextTestRunner, None] = ...,
+         testLoader: TestLoader = ..., exit: bool = ..., verbosity: int = ...,
+         failfast: Optional[bool] = ..., catchbreak: Optional[bool] = ...,
+         buffer: Optional[bool] = ...) -> TestProgram: ...
 
 # private but occasionally used
 util = ...  # type: types.ModuleType