@@ -169,6 +169,12 @@ func (suite *BadProtocolTestSuite) doBadProtoTest(req nosqldb.Request, data []by
169
169
}
170
170
}
171
171
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
+
172
178
func (suite * BadProtocolTestSuite ) TestBadGetRequest () {
173
179
req := & nosqldb.GetRequest {
174
180
TableName : suite .table ,
@@ -200,7 +206,7 @@ func (suite *BadProtocolTestSuite) TestBadGetRequest() {
200
206
desc = "Invalid serial version"
201
207
off = seekPos (lengths , 0 )
202
208
suite .wr .Reset ()
203
- suite .wr .WriteSerialVersion (proto . SerialVersion + 1 )
209
+ suite .wr .WriteSerialVersion (0 )
204
210
copy (data [off :], suite .wr .Bytes ())
205
211
suite .doBadProtoTest (req , data , desc , nosqlerr .BadProtocolMessage )
206
212
@@ -867,7 +873,11 @@ func (suite *BadProtocolTestSuite) TestBadTableRequest() {
867
873
suite .wr .Reset ()
868
874
suite .wr .WriteInt (r .value )
869
875
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 )
871
881
}
872
882
}
873
883
0 commit comments