test: fix pyright strict-mode errors in tests/test_observable/ (batch 3)

tests/test_observable/test_bufferwithcount.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 from reactivex import operators as ops
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -17,7 +18,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_create.py

@@ -1,6 +1,8 @@
 import unittest
+from typing import NoReturn
 
 import reactivex
+from reactivex.disposable import Disposable
 from reactivex.testing import ReactiveTest, TestScheduler
 
 on_next = ReactiveTest.on_next
@@ -17,7 +19,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: str) -> NoReturn:
     raise RxException(ex)
 
 
@@ -29,7 +31,7 @@ def _create():
             def subscribe(o, scheduler=None):
                 o.on_next(1)
                 o.on_next(2)
-                return lambda: None
+                return Disposable()
 
             return reactivex.create(subscribe)
 
@@ -43,9 +45,9 @@ def _create():
             def subscribe(o, scheduler=None):
                 o.on_completed()
                 o.on_next(100)
-                o.on_error("ex")
+                o.on_error(Exception("ex"))
                 o.on_completed()
-                return lambda: None
+                return Disposable()
 
             return reactivex.create(subscribe)
 
@@ -58,11 +60,11 @@ def test_create_error(self):
 
         def _create():
             def subscribe(o, scheduler=None):
-                o.on_error(ex)
+                o.on_error(Exception(ex))
                 o.on_next(100)
-                o.on_error("foo")
+                o.on_error(Exception("foo"))
                 o.on_completed()
-                return lambda: None
+                return Disposable()
 
             return reactivex.create(subscribe)
 
@@ -109,7 +111,7 @@ def action4(scheduler, state):
                 def dispose():
                     is_stopped[0] = True
 
-                return dispose
+                return Disposable(dispose)
 
             return reactivex.create(subscribe)
 
@@ -124,21 +126,21 @@ def dispose():
     def test_create_observer_throws(self):
         def subscribe(o, scheduler=None):
             o.on_next(1)
-            return lambda: None
+            return Disposable()
 
         with self.assertRaises(RxException):
             reactivex.create(subscribe).subscribe(lambda x: _raise("ex"))
 
         def subscribe2(o, scheduler=None):
-            o.on_error("exception")
-            return lambda: None
+            o.on_error(Exception("exception"))
+            return Disposable()
 
         with self.assertRaises(RxException):
             reactivex.create(subscribe2).subscribe(on_error=lambda ex: _raise("ex"))
 
         def subscribe3(o, scheduler=None):
             o.on_completed()
-            return lambda: None
+            return Disposable()
 
         with self.assertRaises(RxException):
             reactivex.create(subscribe3).subscribe(on_completed=lambda: _raise("ex"))

tests/test_observable/test_debounce.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 from reactivex import empty, never, throw
 from reactivex import operators as _
@@ -18,7 +19,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_defer.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 import reactivex
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -18,7 +19,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_delay.py

@@ -1,6 +1,7 @@
 import logging
 import unittest
 from datetime import datetime, timezone
+from typing import NoReturn
 
 from reactivex.operators import delay
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -23,7 +24,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_delaywithmapper.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 from reactivex import Observable, abc
 from reactivex import operators as ops
@@ -20,7 +21,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_distinct.py

@@ -1,5 +1,6 @@
 import math
 import unittest
+from typing import NoReturn
 
 from reactivex import operators as ops
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -18,7 +19,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_distinctuntilchanged.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 import reactivex
 from reactivex import operators as ops
@@ -18,7 +19,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 
@@ -282,7 +283,7 @@ def test_distinct_until_changed_key_mapper_throws(self):
         )
 
         def create():
-            return xs.pipe(ops.distinct_until_changed(lambda x: _raise(ex)))
+            return xs.pipe(ops.distinct_until_changed(lambda x: _raise(Exception(ex))))
 
         results = scheduler.start(create)
         assert results.messages == [on_error(210, ex)]
@@ -296,7 +297,7 @@ def test_distinct_until_changed_comparer_throws(self):
 
         def create():
             return xs.pipe(
-                ops.distinct_until_changed(comparer=lambda x, y: _raise(ex)),
+                ops.distinct_until_changed(comparer=lambda x, y: _raise(Exception(ex))),
             )
 
         results = scheduler.start(create)

tests/test_observable/test_expand.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 from reactivex import operators as ops
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -17,7 +18,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_finally.py

@@ -19,7 +19,6 @@ def test_finally_only_called_once_empty(self):
 
         def action():
             invasserte_count[0] += 1
-            return invasserte_count
 
         some_observable = reactivex.empty().pipe(ops.finally_action(action))
 
@@ -36,7 +35,6 @@ def test_finally_empty(self):
         def create():
             def action():
                 invasserted[0] = True
-                return invasserted[0]
 
             return xs.pipe(ops.finally_action(action))
 
@@ -55,7 +53,6 @@ def test_finally_return(self):
         def create():
             def action():
                 invasserted[0] = True
-                return invasserted[0]
 
             return xs.pipe(ops.finally_action(action))
 
@@ -78,7 +75,6 @@ def test_finally_on_error(self):
         def create():
             def action():
                 invasserted[0] = True
-                return invasserted[0]
 
             return xs.pipe(ops.finally_action(action))
 

tests/test_observable/test_firstordefault.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 from reactivex import operators as ops
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -17,7 +18,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_fromcallback.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 import reactivex
 from reactivex.testing import ReactiveTest
@@ -17,7 +18,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 

tests/test_observable/test_fromiterable.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 import reactivex
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -17,7 +18,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 
@@ -71,4 +72,6 @@ def test_double_subscribe_to_iterable(self):
 
     def test_observer_throws(self):
         with self.assertRaises(RxException):
-            reactivex.from_iterable([1, 2, 3]).subscribe(lambda x: _raise("ex"))
+            reactivex.from_iterable([1, 2, 3]).subscribe(
+                lambda x: _raise(Exception("ex"))
+            )

tests/test_observable/test_generatewithrelativetime.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 import reactivex
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -17,7 +18,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)
 
 
@@ -45,7 +46,7 @@ def test_generate_timespan_throw_condition(self):
 
         def create():
             return reactivex.generate_with_relative_time(
-                0, lambda x: _raise(ex), lambda x: x + 1, lambda x: x + 1
+                0, lambda x: _raise(Exception(ex)), lambda x: x + 1, lambda x: x + 1
             )
 
         results = scheduler.start(create)
@@ -57,7 +58,7 @@ def test_generate_timespan_throw_iterate(self):
 
         def create():
             return reactivex.generate_with_relative_time(
-                0, lambda x: True, lambda x: _raise(ex), lambda x: x + 1
+                0, lambda x: True, lambda x: _raise(Exception(ex)), lambda x: x + 1
             )
 
         results = scheduler.start(create)
@@ -69,7 +70,7 @@ def test_generate_timespan_throw_timemapper(self):
 
         def create():
             return reactivex.generate_with_relative_time(
-                0, lambda x: True, lambda x: x + 1, lambda x: _raise(ex)
+                0, lambda x: True, lambda x: x + 1, lambda x: _raise(Exception(ex))
             )
 
         results = scheduler.start(create)
@@ -109,7 +110,7 @@ def test_generate_datetime_offset_throw_condition(self):
 
         def create():
             return reactivex.generate_with_relative_time(
-                0, lambda x: _raise(ex), lambda x: x + 1, lambda x: x + 1
+                0, lambda x: _raise(Exception(ex)), lambda x: x + 1, lambda x: x + 1
             )
 
         results = scheduler.start(create)
@@ -121,7 +122,7 @@ def test_generate_datetime_offset_throw_iterate(self):
 
         def create():
             return reactivex.generate_with_relative_time(
-                0, lambda x: True, lambda x: _raise(ex), lambda x: x + 1
+                0, lambda x: True, lambda x: _raise(Exception(ex)), lambda x: x + 1
             )
 
         results = scheduler.start(create)
@@ -133,7 +134,7 @@ def test_generate_datetime_offset_throw_time_mapper(self):
 
         def create():
             return reactivex.generate_with_relative_time(
-                0, lambda x: True, lambda x: x + 1, lambda x: _raise(ex)
+                0, lambda x: True, lambda x: x + 1, lambda x: _raise(Exception(ex))
             )
 
         results = scheduler.start(create)

tests/test_observable/test_last.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import NoReturn
 
 from reactivex import operators as _
 from reactivex.testing import ReactiveTest, TestScheduler
@@ -17,7 +18,7 @@ class RxException(Exception):
 
 
 # Helper function for raising exceptions within lambdas
-def _raise(ex):
+def _raise(ex: Exception) -> NoReturn:
     raise RxException(ex)