diff --git a/tests/test_observable/test_bufferwithcount.py b/tests/test_observable/test_bufferwithcount.py index 6bc10cfe..d07424ba 100644 --- a/tests/test_observable/test_bufferwithcount.py +++ b/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) diff --git a/tests/test_observable/test_create.py b/tests/test_observable/test_create.py index e26715d3..0a85c34b 100644 --- a/tests/test_observable/test_create.py +++ b/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")) diff --git a/tests/test_observable/test_debounce.py b/tests/test_observable/test_debounce.py index 9f61195d..cc1d7300 100644 --- a/tests/test_observable/test_debounce.py +++ b/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) diff --git a/tests/test_observable/test_defer.py b/tests/test_observable/test_defer.py index 669fbf40..10d22f38 100644 --- a/tests/test_observable/test_defer.py +++ b/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) diff --git a/tests/test_observable/test_delay.py b/tests/test_observable/test_delay.py index d11000bb..974bba9c 100644 --- a/tests/test_observable/test_delay.py +++ b/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) diff --git a/tests/test_observable/test_delaywithmapper.py b/tests/test_observable/test_delaywithmapper.py index cfe8da95..f74e7dbd 100644 --- a/tests/test_observable/test_delaywithmapper.py +++ b/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) diff --git a/tests/test_observable/test_distinct.py b/tests/test_observable/test_distinct.py index a5a725f5..edfbe941 100644 --- a/tests/test_observable/test_distinct.py +++ b/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) diff --git a/tests/test_observable/test_distinctuntilchanged.py b/tests/test_observable/test_distinctuntilchanged.py index dae0220d..26254f0b 100644 --- a/tests/test_observable/test_distinctuntilchanged.py +++ b/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) diff --git a/tests/test_observable/test_expand.py b/tests/test_observable/test_expand.py index 0fa7d315..05462fc9 100644 --- a/tests/test_observable/test_expand.py +++ b/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) diff --git a/tests/test_observable/test_finally.py b/tests/test_observable/test_finally.py index 69e7cd51..7d920e06 100644 --- a/tests/test_observable/test_finally.py +++ b/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)) diff --git a/tests/test_observable/test_firstordefault.py b/tests/test_observable/test_firstordefault.py index 3f0417a3..5ed069a2 100644 --- a/tests/test_observable/test_firstordefault.py +++ b/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) diff --git a/tests/test_observable/test_fromcallback.py b/tests/test_observable/test_fromcallback.py index ca46db72..dc1b9525 100644 --- a/tests/test_observable/test_fromcallback.py +++ b/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) diff --git a/tests/test_observable/test_fromiterable.py b/tests/test_observable/test_fromiterable.py index 93ef9617..03c91555 100644 --- a/tests/test_observable/test_fromiterable.py +++ b/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")) + ) diff --git a/tests/test_observable/test_generatewithrelativetime.py b/tests/test_observable/test_generatewithrelativetime.py index 10e7e4bc..50951abd 100644 --- a/tests/test_observable/test_generatewithrelativetime.py +++ b/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) diff --git a/tests/test_observable/test_last.py b/tests/test_observable/test_last.py index dcf7148a..a9631a08 100644 --- a/tests/test_observable/test_last.py +++ b/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) diff --git a/tests/test_observable/test_merge.py b/tests/test_observable/test_merge.py index 0c9ed086..395f0d7e 100644 --- a/tests/test_observable/test_merge.py +++ b/tests/test_observable/test_merge.py @@ -291,7 +291,7 @@ def test_merge_error_causes_disposal(self): source_not_disposed = [False] o1 = scheduler.create_hot_observable(msgs1) - def action(): + def action(_: object) -> None: source_not_disposed[0] = True o2 = scheduler.create_hot_observable(msgs2).pipe(ops.do_action(on_next=action)) diff --git a/tests/test_observable/test_minby.py b/tests/test_observable/test_minby.py index 0cc94336..f8002ec4 100644 --- a/tests/test_observable/test_minby.py +++ b/tests/test_observable/test_minby.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) @@ -278,7 +279,9 @@ def reverse_comparer(a, b): xs = scheduler.create_hot_observable(msgs) def create(): - return xs.pipe(ops.min_by(lambda x: _raise(ex), reverse_comparer)) + return xs.pipe( + ops.min_by(lambda x: _raise(Exception(ex)), reverse_comparer) + ) res = scheduler.start(create=create).messages assert res == [on_error(210, ex)] @@ -295,7 +298,7 @@ def test_min_by_comparer_throws(self): ] def reverse_comparer(a, b): - _raise(ex) + _raise(Exception(ex)) xs = scheduler.create_hot_observable(msgs) diff --git a/tests/test_observable/test_publish.py b/tests/test_observable/test_publish.py index fba448e8..4f5a17fe 100644 --- a/tests/test_observable/test_publish.py +++ b/tests/test_observable/test_publish.py @@ -1,4 +1,5 @@ import unittest +from typing import NoReturn import reactivex from reactivex import ConnectableObservable, Observable @@ -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) diff --git a/tests/test_observable/test_returnvalue.py b/tests/test_observable/test_returnvalue.py index 0810342f..43bf1089 100644 --- a/tests/test_observable/test_returnvalue.py +++ b/tests/test_observable/test_returnvalue.py @@ -1,4 +1,5 @@ import unittest +from typing import NoReturn import reactivex from reactivex.disposable import SerialDisposable @@ -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) diff --git a/tests/test_observable/test_single.py b/tests/test_observable/test_single.py index 4e93c968..8bb5c40b 100644 --- a/tests/test_observable/test_single.py +++ b/tests/test_observable/test_single.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) diff --git a/tests/test_observable/test_singleordefault.py b/tests/test_observable/test_singleordefault.py index 60977924..bf565ac4 100644 --- a/tests/test_observable/test_singleordefault.py +++ b/tests/test_observable/test_singleordefault.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) diff --git a/tests/test_observable/test_takeuntilwithtime.py b/tests/test_observable/test_takeuntilwithtime.py index 6b577a53..7ad234ed 100644 --- a/tests/test_observable/test_takeuntilwithtime.py +++ b/tests/test_observable/test_takeuntilwithtime.py @@ -1,5 +1,6 @@ import unittest from datetime import datetime, timezone +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) diff --git a/tests/test_observable/test_timeout.py b/tests/test_observable/test_timeout.py index f78cfc27..39b757e6 100644 --- a/tests/test_observable/test_timeout.py +++ b/tests/test_observable/test_timeout.py @@ -1,5 +1,6 @@ import unittest from datetime import datetime, timezone +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) diff --git a/tests/test_observable/test_timeoutwithmapper.py b/tests/test_observable/test_timeoutwithmapper.py index 6f445456..43a5540b 100644 --- a/tests/test_observable/test_timeoutwithmapper.py +++ b/tests/test_observable/test_timeoutwithmapper.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) diff --git a/tests/test_observable/test_using.py b/tests/test_observable/test_using.py index 2158d725..1f46e93d 100644 --- a/tests/test_observable/test_using.py +++ b/tests/test_observable/test_using.py @@ -1,4 +1,5 @@ import unittest +from typing import NoReturn import reactivex from reactivex.testing import MockDisposable, 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) @@ -165,7 +166,7 @@ def test_using_throw_resource_mapper(self): def create(): def create_resource(): dispose_invoked[0] += 1 - raise _raise(ex) + _raise(Exception(ex)) def create_observable(d): create_invoked[0] += 1 @@ -194,7 +195,7 @@ def create_resource(): def create_observable(d): create_invoked[0] += 1 - _raise(ex) + _raise(Exception(ex)) return reactivex.using(create_resource, create_observable)