Skip to content

Commit 7a5bc3b

Browse files
committed
Fixed protocol test to accept IllegalArgument for newer servers.
1 parent a0ffe80 commit 7a5bc3b

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

nosqldb/bad_protocol_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,12 @@ func (suite *BadProtocolTestSuite) doBadProtoTest(req nosqldb.Request, data []by
169169
}
170170
}
171171

172+
func (suite *BadProtocolTestSuite) doBadProtoTest2(req nosqldb.Request, data []byte, desc string, expectErrCode1 nosqlerr.ErrorCode, expectErrCode2 nosqlerr.ErrorCode) {
173+
_, err := suite.bpTestClient.DoExecute(context.Background(), req, data)
174+
suite.Truef((nosqlerr.Is(err, expectErrCode1) || nosqlerr.Is(err, expectErrCode2)),
175+
"%q failed, got error %v, want error %s or %s", desc, err, expectErrCode1, expectErrCode2)
176+
}
177+
172178
func (suite *BadProtocolTestSuite) TestBadGetRequest() {
173179
req := &nosqldb.GetRequest{
174180
TableName: suite.table,
@@ -200,7 +206,7 @@ func (suite *BadProtocolTestSuite) TestBadGetRequest() {
200206
desc = "Invalid serial version"
201207
off = seekPos(lengths, 0)
202208
suite.wr.Reset()
203-
suite.wr.WriteSerialVersion(proto.SerialVersion + 1)
209+
suite.wr.WriteSerialVersion(0)
204210
copy(data[off:], suite.wr.Bytes())
205211
suite.doBadProtoTest(req, data, desc, nosqlerr.BadProtocolMessage)
206212

@@ -867,7 +873,11 @@ func (suite *BadProtocolTestSuite) TestBadTableRequest() {
867873
suite.wr.Reset()
868874
suite.wr.WriteInt(r.value)
869875
copy(data[off:], suite.wr.Bytes())
870-
suite.doBadProtoTest(req, data, desc, nosqlerr.BadProtocolMessage)
876+
// depending on server version, these may return
877+
// BadProtocolMessage (older) or IllegalArgument (newer).
878+
suite.doBadProtoTest2(req, data, desc,
879+
nosqlerr.BadProtocolMessage,
880+
nosqlerr.IllegalArgument)
871881
}
872882
}
873883

0 commit comments

Comments
 (0)