@@ -13,7 +13,6 @@ import (
1313 "tests/helpers"
1414 mocklogger "tests/mock"
1515
16- "connectrpc.com/connect"
1716 jobsProto "github.com/roadrunner-server/api-go/v6/jobs/v2"
1817 kvProto "github.com/roadrunner-server/api-go/v6/kv/v2"
1918 jobState "github.com/roadrunner-server/api-plugins/v6/jobs"
@@ -768,8 +767,7 @@ func TestBoltDb(t *testing.T) {
768767func testRPCMethods (t * testing.T ) {
769768 const storage = "boltdb-rr"
770769
771- client := helpers .NewKVClient (t , "127.0.0.1:6001" )
772- ctx := t .Context ()
770+ client := helpers .NewRPCClient (t , "127.0.0.1:6001" )
773771
774772 tt := durationpb .New (time .Second * 5 )
775773 keys := & kvProto.KvRequest {
@@ -792,23 +790,27 @@ func testRPCMethods(t *testing.T) {
792790 },
793791 }
794792
795- _ , err := client .Set (ctx , connect .NewRequest (data ))
793+ resp := & kvProto.KvResponse {}
794+ err := client .Call ("kv.Set" , data , resp )
796795 assert .NoError (t , err )
797796
798- resp , err := client .Has (ctx , connect .NewRequest (keys ))
797+ resp = & kvProto.KvResponse {}
798+ err = client .Call ("kv.Has" , keys , resp )
799799 assert .NoError (t , err )
800- assert .Len (t , resp .Msg . GetItems (), 3 )
800+ assert .Len (t , resp .GetItems (), 3 )
801801
802802 // key "c" should be deleted
803803 time .Sleep (time .Second * 7 )
804804
805- resp , err = client .Has (ctx , connect .NewRequest (keys ))
805+ resp = & kvProto.KvResponse {}
806+ err = client .Call ("kv.Has" , keys , resp )
806807 assert .NoError (t , err )
807- assert .Len (t , resp .Msg . GetItems (), 2 )
808+ assert .Len (t , resp .GetItems (), 2 )
808809
809- resp , err = client .MGet (ctx , connect .NewRequest (keys ))
810+ resp = & kvProto.KvResponse {}
811+ err = client .Call ("kv.MGet" , keys , resp )
810812 assert .NoError (t , err )
811- assert .Len (t , resp .Msg . GetItems (), 2 ) // c is expired
813+ assert .Len (t , resp .GetItems (), 2 ) // c is expired
812814
813815 tt2 := durationpb .New (time .Second * 10 )
814816
@@ -821,7 +823,8 @@ func testRPCMethods(t *testing.T) {
821823 },
822824 }
823825
824- _ , err = client .MExpire (ctx , connect .NewRequest (data2 ))
826+ resp = & kvProto.KvResponse {}
827+ err = client .Call ("kv.MExpire" , data2 , resp )
825828 assert .NoError (t , err )
826829
827830 keys2 := & kvProto.KvRequest {
@@ -833,27 +836,31 @@ func testRPCMethods(t *testing.T) {
833836 },
834837 }
835838
836- resp , err = client .TTL (ctx , connect .NewRequest (keys2 ))
839+ resp = & kvProto.KvResponse {}
840+ err = client .Call ("kv.TTL" , keys2 , resp )
837841 assert .NoError (t , err )
838- assert .Len (t , resp .Msg . GetItems (), 3 )
842+ assert .Len (t , resp .GetItems (), 3 )
839843
840844 // HAS AFTER TTL
841845 time .Sleep (time .Second * 15 )
842- resp , err = client .Has (ctx , connect .NewRequest (keys2 ))
846+ resp = & kvProto.KvResponse {}
847+ err = client .Call ("kv.Has" , keys2 , resp )
843848 assert .NoError (t , err )
844- assert .Empty (t , resp .Msg . GetItems ())
849+ assert .Empty (t , resp .GetItems ())
845850
846851 keysDel := & kvProto.KvRequest {
847852 Storage : storage ,
848853 Items : []* kvProto.KvItem {{Key : "e" }},
849854 }
850855
851- _ , err = client .Delete (ctx , connect .NewRequest (keysDel ))
856+ resp = & kvProto.KvResponse {}
857+ err = client .Call ("kv.Delete" , keysDel , resp )
852858 assert .NoError (t , err )
853859
854- resp , err = client .Has (ctx , connect .NewRequest (keysDel ))
860+ resp = & kvProto.KvResponse {}
861+ err = client .Call ("kv.Has" , keysDel , resp )
855862 assert .NoError (t , err )
856- assert .Empty (t , resp .Msg . GetItems ())
863+ assert .Empty (t , resp .GetItems ())
857864
858865 dataClear := & kvProto.KvRequest {
859866 Storage : storage ,
@@ -866,24 +873,28 @@ func testRPCMethods(t *testing.T) {
866873 },
867874 }
868875
869- _ , err = client .Set (ctx , connect .NewRequest (dataClear ))
876+ resp = & kvProto.KvResponse {}
877+ err = client .Call ("kv.Set" , dataClear , resp )
870878 assert .NoError (t , err )
871879
872- resp , err = client .Has (ctx , connect .NewRequest (dataClear ))
880+ resp = & kvProto.KvResponse {}
881+ err = client .Call ("kv.Has" , dataClear , resp )
873882 assert .NoError (t , err )
874- assert .Len (t , resp .Msg . GetItems (), 5 )
883+ assert .Len (t , resp .GetItems (), 5 )
875884
876- _ , err = client .Clear (ctx , connect .NewRequest (& kvProto.KvRequest {Storage : storage }))
885+ resp = & kvProto.KvResponse {}
886+ err = client .Call ("kv.Clear" , & kvProto.KvRequest {Storage : storage }, resp )
877887 assert .NoError (t , err )
878888
879- resp , err = client .Has (ctx , connect .NewRequest (dataClear ))
889+ resp = & kvProto.KvResponse {}
890+ err = client .Call ("kv.Has" , dataClear , resp )
880891 assert .NoError (t , err )
881- assert .Empty (t , resp .Msg . GetItems ())
892+ assert .Empty (t , resp .GetItems ())
882893}
883894
884895func declareBoltDBPipe (address string , file string ) func (t * testing.T ) {
885896 return func (t * testing.T ) {
886- client := helpers .NewJobsClient (t , address )
897+ client := helpers .NewRPCClient (t , address )
887898 req := & jobsProto.DeclareRequest {Pipeline : map [string ]string {
888899 "driver" : "boltdb" ,
889900 "name" : "test-3" ,
@@ -892,7 +903,7 @@ func declareBoltDBPipe(address string, file string) func(t *testing.T) {
892903 "priority" : "3" ,
893904 "file" : file ,
894905 }}
895- _ , err := client .Declare ( t . Context (), connect . NewRequest ( req ) )
906+ err := client .Call ( "jobs.Declare" , req , & jobsProto. JobsHandlerResponse {} )
896907 assert .NoError (t , err )
897908 }
898909}
0 commit comments