8000 Move tests; Add .pyi for test protobuf · FirebirdSQL/python3-base@b1c9ae3 · GitHub
[go: up one dir, main page]
Skip to content

Commit b1c9ae3

Browse files
pcisarpcisar
committed
Move tests; Add .pyi for test protobuf
1 parent bebad7c commit b1c9ae3

12 files changed

+116
-40
lines changed

‎test/base_test.proto renamed to ‎tests/base_test.proto

File renamed without changes.

‎test/base_test_pb2.py renamed to ‎tests/base_test_pb2.py

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/base_test_pb2.pyi

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
from google.protobuf import any_pb2 as _any_pb2
2+
from google.protobuf import struct_pb2 as _struct_pb2
3+
from google.protobuf.internal import containers as _containers
4+
from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
5+
from google.protobuf import descriptor as _descriptor
6+
from google.protobuf import message as _message
7+
from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
8+
9+
DESCRIPTOR: _descriptor.FileDescriptor
10+
11+
class TestEnum(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
12+
__slots__ = []
13+
TEST_UNKNOWN: _ClassVar[TestEnum]
14+
TEST_READY: _ClassVar[TestEnum]
15+
TEST_RUNNING: _ClassVar[TestEnum]
16+
TEST_WAITING: _ClassVar[TestEnum]
17+
TEST_SUSPENDED: _ClassVar[TestEnum]
18+
TEST_FINISHED: _ClassVar[TestEnum]
19+
TEST_ABORTED: _ClassVar[TestEnum]
20+
TEST_CREATED: _ClassVar[TestEnum]
21+
TEST_BLOCKED: _ClassVar[TestEnum]
22+
TEST_STOPPED: _ClassVar[TestEnum]
23+
TEST_TERMINATED: _ClassVar[TestEnum]
24+
TEST_UNKNOWN: TestEnum
25+
TEST_READY: TestEnum
26+
TEST_RUNNING: TestEnum
27+
TEST_WAITING: TestEnum
28+
TEST_SUSPENDED: TestEnum
29+
TEST_FINISHED: TestEnum
30+
TEST_ABORTED: TestEnum
31+
TEST_CREATED: TestEnum
32+
TEST_BLOCKED: TestEnum
33+
TEST_STOPPED: TestEnum
34+
TEST_TERMINATED: TestEnum
35+
36+
class TestState(_message.Message):
37+
__slots__ = ["name", "test"]
38+
NAME_FIELD_NUMBER: _ClassVar[int]
39+
TEST_FIELD_NUMBER: _ClassVar[int]
40+
name: str
41+
test: TestEnum
42+
def __init__(self, name: _Optional[str] = ..., test: _Optional[_Union[TestEnum, str]] = ...) -> None: ...
43+
44+
class TestCollection(_message.Message):
45+
__slots__ = ["name", "tests", "context", "annotation", "supplement"]
46+
NAME_FIELD_NUMBER: _ClassVar[int]
47+
TESTS_FIELD_NUMBER: _ClassVar[int]
48+
CONTEXT_FIELD_NUMBER: _ClassVar[int]
49+
ANNOTATION_FIELD_NUMBER: _ClassVar[int]
50+
SUPPLEMENT_FIELD_NUMBER: _ClassVar[int]
51+
name: str
52+
tests: _containers.RepeatedCompositeFieldContainer[TestState]
53+
context: _struct_pb2.Struct
54+
annotation: _struct_pb2.Struct
55+
supplement: _containers.RepeatedCompositeFieldContainer[_any_pb2.Any]
56+
def __init__(self, name: _Optional[str] = ..., tests: _Optional[_Iterable[_Union[TestState, _Mapping]]] = ..., context: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ..., annotation: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ..., supplement: _Optional[_Iterable[_Union[_any_pb2.Any, _Mapping]]] = ...) -> None: ...

‎test/test_buffer.py renamed to ‎tests/test_buffer.py

File renamed without changes.

‎test/test_collections.py renamed to ‎tests/test_collections.py

File renamed without changes.

‎test/test_config.py renamed to ‎tests/test_config.py

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
from unittest import TestCase, mock, main as unittest_main
3939
from uuid import UUID
4040
from decimal import Decimal
41+
import sys
4142
import io
4243
import os
4344
import platform
@@ -1110,7 +1111,7 @@ def test_simple(self):
11101111
opt.validate()
11111112
opt.load_config(self.conf, PRESENT_S)
11121113
self.assertEqual(opt.value, self.PRESENT_VAL)
1113-
self.assertEqual(opt.get_as_str(), 'THREE | TWO')
1114+
self.assertEqual(opt.get_as_str(), 'THREE | TWO' if sys.version_info.minor < 11 else 'TWO|THREE')
11141115
self.assertIsInstance(opt.value, opt.datatype)
11151116
opt.clear()
11161117
self.assertIsNone(opt.value)
@@ -1188,7 +1189,11 @@ def test_allowed_values(self):
11881189
self.assertEqual(opt.value, self.DEFAULT_VAL)
11891190
with self.assertRaises(ValueError) as cm:
11901191
opt.set_value(self.NEW_VAL)
1191-
self.assertEqual(cm.exception.args, ("Illegal value 'SimpleIntFlag.FIVE' for flag option 'option_name'",))
1192+
if sys.version_info.minor < 11:
1193+
exc_args = ("Illegal value 'SimpleIntFlag.FIVE' for flag option 'option_name'",)
1194+
else:
1195+
exc_args = ("Illegal value '16' for flag option 'option_name'",)
1196+
self.assertEqual(cm.exception.args, exc_args)
11921197
def test_default(self):
11931198
opt = config.FlagOption('option_name', SimpleIntFlag, 'description', default=self.DEFAULT_OPT_VAL)
11941199
self.assertEqual(opt.name, 'option_name')
@@ -1251,9 +1256,15 @@ def test_proto(self):
12511256
self.assertFalse('option_name' in self.proto.options)
12521257
def test_get_config(self):
12531258
opt = config.FlagOption('option_name', SimpleIntFlag, 'description', default=self.DEFAULT_OPT_VAL)
1254-
lines = """; description
1259+
if sys.version_info.minor < 11:
1260+
lines = """; description
12551261
; Type: flag [one, two, three, four, five]
12561262
;option_name = four | three
1263+
"""
1264+
else:
1265+
lines = """; description
1266+
; Type: flag [one, two, three, four, five]
1267+
;option_name = three|four
12571268
"""
12581269
self.assertEqual(opt.get_config(), lines)
12591270
lines = """; description
@@ -2274,7 +2285,11 @@ def test_bad_value(self):
22742285
opt = config.PyExprOption('option_name', 'description')
22752286
with self.assertRaises(SyntaxError) as cm:
22762287
opt.load_config(self.conf, BAD_S)
2277-
self.assertEqual(cm.exception.args, ('invalid syntax', ('PyExpr', 1, 15, 'This is not a valid Python expression')))
2288+
if sys.version_info.minor < 10:
2289+
exc_args = ('PyExpr', 1, 15, 'This is not a valid Python expression')
2290+
else:
2291+
exc_args = ('PyExpr', 1, 15, 'This is not a valid Python expression', 1, 20)
2292+
self.assertEqual(cm.exception.args, ('invalid syntax', exc_args))
22782293
with self.assertRaises(TypeError) as cm:
22792294
opt.set_value(10.0)
22802295
self.assertEqual(cm.exception.args, ("Option 'option_name' value must be a 'PyExpr', not 'float'",))
@@ -2430,7 +2445,11 @@ def test_bad_value(self):
24302445
opt = config.PyCodeOption('option_name', 'description')
24312446
with self.assertRaises(SyntaxError) as cm:
24322447
opt.load_config(self.conf, BAD_S)
2433-
self.assertEqual(cm.exception.args, ('invalid syntax', ('PyCode', 1, 15, 'This is not a valid Python code block\n')))
2448+
if sys.version_info.minor < 10:
2449+
exc_args = ('PyCode', 1, 15, 'This is not a valid Python code block\n')
2450+
else:
2451+
exc_args = ('PyCode', 1, 15, 'This is not a valid Python code block\n', 1, 20)
2452+
self.assertEqual(cm.exception.args, ('invalid syntax', exc_args))
24342453
with self.assertRaises(TypeError) as cm:
24352454
opt.set_value(10.0)
24362455
self.assertEqual(cm.exception.args, ("Option 'option_name' value must be a 'PyCode', not 'float'",))

‎test/test_hooks.py renamed to ‎tests/test_hooks.py

File renamed without changes.

‎test/test_logging.py renamed to ‎tests/test_logging.py

File renamed without changes.

‎test/test_protobuf.py renamed to ‎tests/test_protobuf.py

File renamed without changes.

‎test/test_signal.py renamed to ‎tests/test_signal.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,29 @@ def value_signal(value):
5757

5858
slot_signature = inspect.Signature.from_callable(value_signal)
5959

60-
def testFunc(test, value):
60+
def _Func(test, value):
6161
"""A test standalone function for signals to attach onto"""
6262
test.checkval = value
6363
test.func_call_count += 1
6464

65-
testFunc_signature = inspect.Signature.from_callable(testFunc)
65+
testFunc_signature = inspect.Signature.from_callable(_Func)
6666

67-
def testFuncWithKWDeafult(test, value, kiwi=None):
67+
def _FuncWithKWDeafult(test, value, kiwi=None):
6868
"""A test standalone function with excess default keyword argument for signals to attach onto"""
6969
test.checkval = value
7070
test.func_call_count += 1
7171

72-
def testFuncWithKW(test, value, *, kiwi):
72+
def _FuncWithKW(test, value, *, kiwi):
7373
"""A test standalone function with excess keyword argument for signals to attach onto"""
7474
test.checkval = value
7575
test.func_call_count += 1
7676

77-
def testLocalEmit(signal_instance):
77+
def _LocalEmit(signal_instance):
7878
"""A test standalone function for signals to emit at local level"""
7979
exec('signal_instance.emit()')
8080

8181

82-
def testModuleEmit(signal_instance):
82+
def _ModuleEmit(signal_instance):
8383
"""A test standalone function for signals to emit at module level"""
8484
signal_instance.emit()
8585

@@ -208,40 +208,40 @@ def __init__(self, methodName='runTest'):
208208
def test_PartialConnect(self):
209209
"""Tests connecting signals to partials"""
210210
partialSignal = Signal(nopar_signature)
211-
partialSignal.connect(partial(testFunc, self, 'Partial'))
211+
partialSignal.connect(partial(_Func, self, 'Partial'))
212212
self.assertEqual(len(partialSignal._slots), 1, "Expected single connected slot")
213213

214214
def test_PartialConnectKWDifferOk(self):
215215
"""Tests connecting signals to partials"""
216216
partialSignal = Signal(nopar_signature)
217-
partialSignal.connect(partial(testFuncWithKWDeafult, self, 'Partial'))
217+
partialSignal.connect(partial(_FuncWithKWDeafult, self, 'Partial'))
218218
self.assertEqual(len(partialSignal._slots), 1, "Expected single connected slot")
219219

220220
def test_PartialConnectKWDifferBad(self):
221221
"""Tests connecting signals to partials"""
222222
partialSignal = Signal(nopar_signature)
223223
with self.assertRaises(ValueError):
224-
partialSignal.connect(partial(testFuncWithKW, self, 'Partial'))
224+
partialSignal.connect(partial(_FuncWithKW, self, 'Partial'))
225225
self.assertEqual(len(partialSignal._slots), 0, "Expected single connected slot")
226226

227227
def test_PartialConnectDuplicate(self):
228228
"""Tests connecting signals to partials"""
229229
partialSignal = Signal(nopar_signature)
230-
func = partial(testFunc, self, 'Partial')
230+
func = partial(_Func, self, 'Partial')
231231
partialSignal.connect(func)
232232
partialSignal.connect(func)
233233
self.assertEqual(len(partialSignal._slots), 1, "Expected single connected slot")
234234

235235
def test_LambdaConnect(self):
236236
"""Tests connecting signals to lambdas"""
237237
lambdaSignal = Signal(slot_signature)
238-
lambdaSignal.connect(lambda value: testFunc(self, value))
238+
lambdaSignal.connect(lambda value: _Func(self, value))
239239
self.assertEqual(len(lambdaSignal._slots), 1, "Expected single connected slot")
240240

241241
def test_LambdaConnectDuplicate(self):
242242
"""Tests connecting signals to duplicate lambdas"""
243243
lambdaSignal = Signal(slot_signature)
244-
func = lambda value: testFunc(self, value)
244+
func = lambda value: _Func(self, value)
245245
lambdaSignal.connect(func)
246246
lambdaSignal.connect(func)
247247
self.assertEqual(len(lambdaSignal._slots), 1, "Expected single connected slot")
@@ -274,14 +274,14 @@ def test_MethodConnectDifferentInstances(self):
274274
def test_FunctionConnect(self):
275275
"""Test connecting signals to standalone functions"""
276276
funcSignal = Signal(testFunc_signature)
277-
funcSignal.connect(testFunc)
277+
funcSignal.connect(_Func)
278278
self.assertEqual(len(funcSignal._slots), 1, "Expected single connected slot")
279279

280280
def test_FunctionConnectDuplicate(self):
281281
"""Test that each function connection is unique"""
282282
funcSignal = Signal(testFunc_signature)
283-
funcSignal.connect(testFunc)
284-
funcSignal.connect(testFunc)
283+
funcSignal.connect(_Func)
284+
funcSignal.connect(_Func)
285285
self.assertEqual(len(funcSignal._slots), 1, "Expected single connected slot")
286286

287287
def test_ConnectNonCallable(self):
@@ -293,15 +293,15 @@ def test_ConnectNonCallable(self):
293293
def test_EmitToPartial(self):
294294
"""Test emitting signals to partial"""
295295
partialSignal = Signal(nopar_signature)
296-
partialSignal.connect(partial(testFunc, self, 'Partial'))
296+
partialSignal.connect(partial(_Func, self, 'Partial'))
297297
partialSignal.emit()
298298
self.assertEqual(self.checkval, 'Partial')
299299
self.assertEqual(self.func_call_count, 1, "Expected function to be called once")
300300

301301
def test_EmitToLambda(self):
302302
"""Test emitting signal to lambda"""
303303
lambdaSignal = Signal(slot_signature)
304-
lambdaSignal.connect(lambda value: testFunc(self, value))
304+
lambdaSignal.connect(lambda value: _Func(self, value))
305305
lambdaSignal.emit('Lambda')
306306
self.assertEqual(self.checkval, 'Lambda')
307307
self.assertEqual(self.func_call_count, 1, "Expected function to be called once")
@@ -327,7 +327,7 @@ def test_EmitToMethodOnDeletedInstance(self):
327327
def test_EmitToFunction(self):
328328
"""Test emitting signal to standalone function"""
329329
funcSignal = Signal(testFunc_signature)
330-
funcSignal.connect(testFunc)
330+
funcSignal.connect(_Func)
331331
funcSignal.emit(self, 'Function')
332332
self.assertEqual(self.checkval, 'Function')
333333
self.assertEqual(self.func_call_count, 1, "Expected function to be called once")
@@ -347,15 +347,15 @@ def ToDelete(test, value):
347347
def test_PartialDisconnect(self):
348348
"""Test disconnecting partial function"""
349349
partialSignal = Signal(nopar_signature)
350-
part = partial(testFunc, self, 'Partial')
350+
part = partial(_Func, self, 'Partial')
351351
partialSignal.connect(part)
352352
partialSignal.disconnect(part)
353353
self.assertEqual(self.checkval, None, "Slot was not removed from signal")
354354

355355
def test_PartialDisconnectUnconnected(self):
356356
"""Test disconnecting unconnected partial function"""
357357
partialSignal = Signal(slot_signature)
358-
part = partial(testFunc, self, 'Partial')
358+
part = partial(_Func, self, 'Partial')
359359
try:
360360
partialSignal.disconnect(part)
361361
except:
@@ -364,15 +364,15 @@ def test_PartialDisconnectUnconnected(self):
364364
def test_LambdaDisconnect(self):
365365
"""Test disconnecting lambda function"""
366366
lambdaSignal = Signal(slot_signature)
367-
func = lambda value: testFunc(self, value)
367+
func = lambda value: _Func(self, value)
368368
lambdaSignal.connect(func)
369369
lambdaSignal.disconnect(func)
370370
self.assertEqual(len(lambdaSignal._slots), 0, "Slot was not removed from signal")
371371

372372
def test_LambdaDisconnectUnconnected(self):
373373
"""Test disconnecting unconnected lambda function"""
374374
lambdaSignal = Signal(slot_signature)
375-
func = lambda value: testFunc(self, value)
375+
func = lambda value: _Func(self, value)
376376
try:
377377
lambdaSignal.disconnect(func)
378378
except:
@@ -398,15 +398,15 @@ def test_MethodDisconnectUnconnected(self):
398398
def test_FunctionDisconnect(self):
399399
"""Test disconnecting function"""
400400
funcSignal = Signal(testFunc_signature)
401-
funcSignal.connect(testFunc)
402-
funcSignal.disconnect(testFunc)
401+
funcSignal.connect(_Func)
402+
funcSignal.disconnect(_Func)
403403
self.assertEqual(len(funcSignal._slots), 0, "Slot was not removed from signal")
404404

405405
def test_FunctionDisconnectUnconnected(self):
406406
"""Test disconnecting unconnected function"""
407407
funcSignal = Signal(slot_signature)
408408
try:
409-
funcSignal.disconnect(testFunc)
409+
funcSignal.disconnect(_Func)
410410
except:
411411
self.fail("Disconnecting unconnected function should not raise")
412412

@@ -422,7 +422,7 @@ def test_ClearSlots(self):
422422
"""Test clearing all slots"""
423423
multiSignal = Signal(slot_signature)
424424
func = lambda value: self.setVal(value)
425-
multiSignal.connect(partial(testFunc, self))
425+
multiSignal.connect(partial(_Func, self))
426426
multiSignal.connect(self.setVal)
427427
multiSignal.clear()
428428
self.assertEqual(len(multiSignal._slots), 0, "Not all slots were removed from signal")

0 commit comments

Comments
 (0)
0