|
1 | 1 | # Builtin modules |
2 | 2 | import os, unittest, socket |
3 | 3 | from time import monotonic |
4 | | -from typing import Type |
5 | 4 | # Third party modules |
6 | 5 | from fsLogger import SimpleLogger, Logger |
7 | | -from fsSignal import Signal, BaseSignal |
| 6 | +from fsSignal import Signal, T_Signal |
8 | 7 | # Local modules |
9 | 8 | from .. import Client, Request, FEIterator |
10 | 9 | # Program |
11 | 10 | class ClientTest(unittest.TestCase): |
12 | | - signal:Type[BaseSignal] |
| 11 | + signal:T_Signal |
13 | 12 | @classmethod |
14 | 13 | def setUpClass(cls) -> None: |
15 | 14 | if os.environ.get("DEBUG") == "1": |
16 | 15 | SimpleLogger("TRACE") |
17 | | - cls.signal = Signal.getSoftSignal() |
| 16 | + cls.signal = Signal() |
18 | 17 | return None |
19 | 18 | def test_withStatement(self) -> None: |
20 | 19 | with Client(log=Logger("test_withStatement.Client")) as fec: |
@@ -48,14 +47,23 @@ def test_iterator(self) -> None: |
48 | 47 | ] |
49 | 48 | it = fec.createIterator("iterBlocks", "btc", sortBy="blockheight", chunks=2, bitmask=1) |
50 | 49 | self.assertIs(type(it), FEIterator) |
| 50 | + i = 0 |
51 | 51 | for i, r in islice(enumerate(it), 3): |
52 | 52 | self.assertEqual(data[i], r) |
| 53 | + else: |
| 54 | + self.assertGreater(i, 0) |
| 55 | + i = 0 |
53 | 56 | for i, r in islice(enumerate(it, 3), 1): |
54 | 57 | self.assertEqual(data[i], r) |
| 58 | + else: |
| 59 | + self.assertGreater(i, 0) |
55 | 60 | # |
56 | 61 | it = fec.createIterator("iterBlocks", "btc", sortBy="blockheight", fromKey=data[4][0], chunks=2, bitmask=1) |
| 62 | + i = 0 |
57 | 63 | for i, r in islice(enumerate(it, 5), 3): |
58 | 64 | self.assertEqual(data[i], r) |
| 65 | + else: |
| 66 | + self.assertGreater(i, 0) |
59 | 67 | self.assertTrue(it.hasNext()) |
60 | 68 | self.assertEqual(it.next(), data[8]) |
61 | 69 | # |
|
0 commit comments