Skip to content

Commit

Permalink
Fix python tests (#7960)
Browse files Browse the repository at this point in the history 
* Don't generate types unless --python-typing specified

Fixes #7944

* Fix incorrect import statements

Fixes #7951

* Fix $PYTHONPATH in PythonTest.sh

Regressed from #7529

* PythonTest: fail if something goes wrong

GitHub Actions runs `bash PythonTest.sh`, and thus failures were not
visible.

* Build flatc for Python tests

* Regenerate codes

---------

Co-authored-by: Derek Bailey <derekbailey@google.com>
  • Loading branch information
@yan12125 @dbaileychess
yan12125 and dbaileychess committed May 17, 2023
1 parent cb14043 commit a352bdb
Show file tree
Hide file tree
Showing 25 changed files with 234 additions and 224 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
View file
Expand Up @@ -467,6 +467,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: flatc
# FIXME: make test script not rely on flatc
run: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_INSTALL=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF -DFLATBUFFERS_STRICT_MODE=ON . && make -j
- name: test
working-directory: tests
run: bash PythonTest.sh
Expand Down
2 changes: 1 addition & 1 deletion grpc/examples/python/greeter/models/HelloReply.py
View file
Expand Up @@ -40,7 +40,7 @@ def Start(builder):
def HelloReplyAddMessage(builder, message):
builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(message), 0)

def AddMessage(builder: flatbuffers.Builder, message: int):
def AddMessage(builder, message):
HelloReplyAddMessage(builder, message)

def HelloReplyEnd(builder):
Expand Down
2 changes: 1 addition & 1 deletion grpc/examples/python/greeter/models/HelloRequest.py
View file
Expand Up @@ -40,7 +40,7 @@ def Start(builder):
def HelloRequestAddName(builder, name):
builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0)

def AddName(builder: flatbuffers.Builder, name: int):
def AddName(builder, name):
HelloRequestAddName(builder, name)

def HelloRequestEnd(builder):
Expand Down
20 changes: 10 additions & 10 deletions python/flatbuffers/reflection/Enum.py
View file
Expand Up @@ -42,7 +42,7 @@ def Values(self, j):
x = self._tab.Vector(o)
x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4
x = self._tab.Indirect(x)
from .reflection.EnumVal import EnumVal
from reflection.EnumVal import EnumVal
obj = EnumVal()
obj.Init(self._tab.Bytes, x)
return obj
Expand Down Expand Up @@ -72,7 +72,7 @@ def UnderlyingType(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
if o != 0:
x = self._tab.Indirect(o + self._tab.Pos)
from .reflection.Type import Type
from reflection.Type import Type
obj = Type()
obj.Init(self._tab.Bytes, x)
return obj
Expand All @@ -85,7 +85,7 @@ def Attributes(self, j):
x = self._tab.Vector(o)
x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4
x = self._tab.Indirect(x)
from .reflection.KeyValue import KeyValue
from reflection.KeyValue import KeyValue
obj = KeyValue()
obj.Init(self._tab.Bytes, x)
return obj
Expand Down Expand Up @@ -140,13 +140,13 @@ def Start(builder):
def EnumAddName(builder, name):
builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0)

def AddName(builder: flatbuffers.Builder, name: int):
def AddName(builder, name):
EnumAddName(builder, name)

def EnumAddValues(builder, values):
builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(values), 0)

def AddValues(builder: flatbuffers.Builder, values: int):
def AddValues(builder, values):
EnumAddValues(builder, values)

def EnumStartValuesVector(builder, numElems):
Expand All @@ -158,19 +158,19 @@ def StartValuesVector(builder, numElems: int) -> int:
def EnumAddIsUnion(builder, isUnion):
builder.PrependBoolSlot(2, isUnion, 0)

def AddIsUnion(builder: flatbuffers.Builder, isUnion: bool):
def AddIsUnion(builder, isUnion):
EnumAddIsUnion(builder, isUnion)

def EnumAddUnderlyingType(builder, underlyingType):
builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(underlyingType), 0)

def AddUnderlyingType(builder: flatbuffers.Builder, underlyingType: int):
def AddUnderlyingType(builder, underlyingType):
EnumAddUnderlyingType(builder, underlyingType)

def EnumAddAttributes(builder, attributes):
builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(attributes), 0)

def AddAttributes(builder: flatbuffers.Builder, attributes: int):
def AddAttributes(builder, attributes):
EnumAddAttributes(builder, attributes)

def EnumStartAttributesVector(builder, numElems):
Expand All @@ -182,7 +182,7 @@ def StartAttributesVector(builder, numElems: int) -> int:
def EnumAddDocumentation(builder, documentation):
builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(documentation), 0)

def AddDocumentation(builder: flatbuffers.Builder, documentation: int):
def AddDocumentation(builder, documentation):
EnumAddDocumentation(builder, documentation)

def EnumStartDocumentationVector(builder, numElems):
Expand All @@ -194,7 +194,7 @@ def StartDocumentationVector(builder, numElems: int) -> int:
def EnumAddDeclarationFile(builder, declarationFile):
builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(declarationFile), 0)

def AddDeclarationFile(builder: flatbuffers.Builder, declarationFile: int):
def AddDeclarationFile(builder, declarationFile):
EnumAddDeclarationFile(builder, declarationFile)

def EnumEnd(builder):
Expand Down
14 changes: 7 additions & 7 deletions python/flatbuffers/reflection/EnumVal.py
View file
Expand Up @@ -47,7 +47,7 @@ def UnionType(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
if o != 0:
x = self._tab.Indirect(o + self._tab.Pos)
from .reflection.Type import Type
from reflection.Type import Type
obj = Type()
obj.Init(self._tab.Bytes, x)
return obj
Expand Down Expand Up @@ -80,7 +80,7 @@ def Attributes(self, j):
x = self._tab.Vector(o)
x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4
x = self._tab.Indirect(x)
from .reflection.KeyValue import KeyValue
from reflection.KeyValue import KeyValue
obj = KeyValue()
obj.Init(self._tab.Bytes, x)
return obj
Expand All @@ -107,25 +107,25 @@ def Start(builder):
def EnumValAddName(builder, name):
builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0)

def AddName(builder: flatbuffers.Builder, name: int):
def AddName(builder, name):
EnumValAddName(builder, name)

def EnumValAddValue(builder, value):
builder.PrependInt64Slot(1, value, 0)

def AddValue(builder: flatbuffers.Builder, value: int):
def AddValue(builder, value):
EnumValAddValue(builder, value)

def EnumValAddUnionType(builder, unionType):
builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(unionType), 0)

def AddUnionType(builder: flatbuffers.Builder, unionType: int):
def AddUnionType(builder, unionType):
EnumValAddUnionType(builder, unionType)

def EnumValAddDocumentation(builder, documentation):
builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(documentation), 0)

def AddDocumentation(builder: flatbuffers.Builder, documentation: int):
def AddDocumentation(builder, documentation):
EnumValAddDocumentation(builder, documentation)

def EnumValStartDocumentationVector(builder, numElems):
Expand All @@ -137,7 +137,7 @@ def StartDocumentationVector(builder, numElems: int) -> int:
def EnumValAddAttributes(builder, attributes):
builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(attributes), 0)

def AddAttributes(builder: flatbuffers.Builder, attributes: int):
def AddAttributes(builder, attributes):
EnumValAddAttributes(builder, attributes)

def EnumValStartAttributesVector(builder, numElems):
Expand Down
32 changes: 16 additions & 16 deletions python/flatbuffers/reflection/Field.py
View file
Expand Up @@ -40,7 +40,7 @@ def Type(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
x = self._tab.Indirect(o + self._tab.Pos)
from .reflection.Type import Type
from reflection.Type import Type
obj = Type()
obj.Init(self._tab.Bytes, x)
return obj
Expand Down Expand Up @@ -102,7 +102,7 @@ def Attributes(self, j):
x = self._tab.Vector(o)
x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4
x = self._tab.Indirect(x)
from .reflection.KeyValue import KeyValue
from reflection.KeyValue import KeyValue
obj = KeyValue()
obj.Init(self._tab.Bytes, x)
return obj
Expand Down Expand Up @@ -172,61 +172,61 @@ def Start(builder):
def FieldAddName(builder, name):
builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0)

def AddName(builder: flatbuffers.Builder, name: int):
def AddName(builder, name):
FieldAddName(builder, name)

def FieldAddType(builder, type):
builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(type), 0)

def AddType(builder: flatbuffers.Builder, type: int):
def AddType(builder, type):
FieldAddType(builder, type)

def FieldAddId(builder, id):
builder.PrependUint16Slot(2, id, 0)

def AddId(builder: flatbuffers.Builder, id: int):
def AddId(builder, id):
FieldAddId(builder, id)

def FieldAddOffset(builder, offset):
builder.PrependUint16Slot(3, offset, 0)

def AddOffset(builder: flatbuffers.Builder, offset: int):
def AddOffset(builder, offset):
FieldAddOffset(builder, offset)

def FieldAddDefaultInteger(builder, defaultInteger):
builder.PrependInt64Slot(4, defaultInteger, 0)

def AddDefaultInteger(builder: flatbuffers.Builder, defaultInteger: int):
def AddDefaultInteger(builder, defaultInteger):
FieldAddDefaultInteger(builder, defaultInteger)

def FieldAddDefaultReal(builder, defaultReal):
builder.PrependFloat64Slot(5, defaultReal, 0.0)

def AddDefaultReal(builder: flatbuffers.Builder, defaultReal: float):
def AddDefaultReal(builder, defaultReal):
FieldAddDefaultReal(builder, defaultReal)

def FieldAddDeprecated(builder, deprecated):
builder.PrependBoolSlot(6, deprecated, 0)

def AddDeprecated(builder: flatbuffers.Builder, deprecated: bool):
def AddDeprecated(builder, deprecated):
FieldAddDeprecated(builder, deprecated)

def FieldAddRequired(builder, required):
builder.PrependBoolSlot(7, required, 0)

def AddRequired(builder: flatbuffers.Builder, required: bool):
def AddRequired(builder, required):
FieldAddRequired(builder, required)

def FieldAddKey(builder, key):
builder.PrependBoolSlot(8, key, 0)

def AddKey(builder: flatbuffers.Builder, key: bool):
def AddKey(builder, key):
FieldAddKey(builder, key)

def FieldAddAttributes(builder, attributes):
builder.PrependUOffsetTRelativeSlot(9, flatbuffers.number_types.UOffsetTFlags.py_type(attributes), 0)

def AddAttributes(builder: flatbuffers.Builder, attributes: int):
def AddAttributes(builder, attributes):
FieldAddAttributes(builder, attributes)

def FieldStartAttributesVector(builder, numElems):
Expand All @@ -238,7 +238,7 @@ def StartAttributesVector(builder, numElems: int) -> int:
def FieldAddDocumentation(builder, documentation):
builder.PrependUOffsetTRelativeSlot(10, flatbuffers.number_types.UOffsetTFlags.py_type(documentation), 0)

def AddDocumentation(builder: flatbuffers.Builder, documentation: int):
def AddDocumentation(builder, documentation):
FieldAddDocumentation(builder, documentation)

def FieldStartDocumentationVector(builder, numElems):
Expand All @@ -250,19 +250,19 @@ def StartDocumentationVector(builder, numElems: int) -> int:
def FieldAddOptional(builder, optional):
builder.PrependBoolSlot(11, optional, 0)

def AddOptional(builder: flatbuffers.Builder, optional: bool):
def AddOptional(builder, optional):
FieldAddOptional(builder, optional)

def FieldAddPadding(builder, padding):
builder.PrependUint16Slot(12, padding, 0)

def AddPadding(builder: flatbuffers.Builder, padding: int):
def AddPadding(builder, padding):
FieldAddPadding(builder, padding)

def FieldAddOffset64(builder, offset64):
builder.PrependBoolSlot(13, offset64, 0)

def AddOffset64(builder: flatbuffers.Builder, offset64: bool):
def AddOffset64(builder, offset64):
FieldAddOffset64(builder, offset64)

def FieldEnd(builder):
Expand Down
4 changes: 2 additions & 2 deletions python/flatbuffers/reflection/KeyValue.py
View file
Expand Up @@ -51,13 +51,13 @@ def Start(builder):
def KeyValueAddKey(builder, key):
builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(key), 0)

def AddKey(builder: flatbuffers.Builder, key: int):
def AddKey(builder, key):
KeyValueAddKey(builder, key)

def KeyValueAddValue(builder, value):
builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0)

def AddValue(builder: flatbuffers.Builder, value: int):
def AddValue(builder, value):
KeyValueAddValue(builder, value)

def KeyValueEnd(builder):
Expand Down
20 changes: 10 additions & 10 deletions python/flatbuffers/reflection/Object.py
View file
Expand Up @@ -42,7 +42,7 @@ def Fields(self, j):
x = self._tab.Vector(o)
x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4
x = self._tab.Indirect(x)
from .reflection.Field import Field
from reflection.Field import Field
obj = Field()
obj.Init(self._tab.Bytes, x)
return obj
Expand Down Expand Up @@ -88,7 +88,7 @@ def Attributes(self, j):
x = self._tab.Vector(o)
x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4
x = self._tab.Indirect(x)
from .reflection.KeyValue import KeyValue
from reflection.KeyValue import KeyValue
obj = KeyValue()
obj.Init(self._tab.Bytes, x)
return obj
Expand Down Expand Up @@ -143,13 +143,13 @@ def Start(builder):
def ObjectAddName(builder, name):
builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0)

def AddName(builder: flatbuffers.Builder, name: int):
def AddName(builder, name):
ObjectAddName(builder, name)

def ObjectAddFields(builder, fields):
builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(fields), 0)

def AddFields(builder: flatbuffers.Builder, fields: int):
def AddFields(builder, fields):
ObjectAddFields(builder, fields)

def ObjectStartFieldsVector(builder, numElems):
Expand All @@ -161,25 +161,25 @@ def StartFieldsVector(builder, numElems: int) -> int:
def ObjectAddIsStruct(builder, isStruct):
builder.PrependBoolSlot(2, isStruct, 0)

def AddIsStruct(builder: flatbuffers.Builder, isStruct: bool):
def AddIsStruct(builder, isStruct):
ObjectAddIsStruct(builder, isStruct)

def ObjectAddMinalign(builder, minalign):
builder.PrependInt32Slot(3, minalign, 0)

def AddMinalign(builder: flatbuffers.Builder, minalign: int):
def AddMinalign(builder, minalign):
ObjectAddMinalign(builder, minalign)

def ObjectAddBytesize(builder, bytesize):
builder.PrependInt32Slot(4, bytesize, 0)

def AddBytesize(builder: flatbuffers.Builder, bytesize: int):
def AddBytesize(builder, bytesize):
ObjectAddBytesize(builder, bytesize)

def ObjectAddAttributes(builder, attributes):
builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(attributes), 0)

def AddAttributes(builder: flatbuffers.Builder, attributes: int):
def AddAttributes(builder, attributes):
ObjectAddAttributes(builder, attributes)

def ObjectStartAttributesVector(builder, numElems):
Expand All @@ -191,7 +191,7 @@ def StartAttributesVector(builder, numElems: int) -> int:
def ObjectAddDocumentation(builder, documentation):
builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(documentation), 0)

def AddDocumentation(builder: flatbuffers.Builder, documentation: int):
def AddDocumentation(builder, documentation):
ObjectAddDocumentation(builder, documentation)

def ObjectStartDocumentationVector(builder, numElems):
Expand All @@ -203,7 +203,7 @@ def StartDocumentationVector(builder, numElems: int) -> int:
def ObjectAddDeclarationFile(builder, declarationFile):
builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(declarationFile), 0)

def AddDeclarationFile(builder: flatbuffers.Builder, declarationFile: int):
def AddDeclarationFile(builder, declarationFile):
ObjectAddDeclarationFile(builder, declarationFile)

def ObjectEnd(builder):
Expand Down

0 comments on commit a352bdb

Please sign in to comment.