Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
neoppod
Commits
190c83b5
Commit
190c83b5
authored
Dec 14, 2016
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
0045b444
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
116 additions
and
113 deletions
+116
-113
t/neo/connection_test.go
t/neo/connection_test.go
+116
-113
No files found.
t/neo/connection_test.go
View file @
190c83b5
...
...
@@ -20,99 +20,123 @@ import (
"bytes"
"context"
"io"
"fmt"
//
"fmt"
"net"
"testing"
"time"
"golang.org/x/sync/errgroup"
"lab.nexedi.com/kirr/go123/exc"
"lab.nexedi.com/kirr/go123/myname"
"lab.nexedi.com/kirr/go123/xerr"
)
// run function which raises exception, and return exception as error, if any
// XXX -> exc.Runx ?
func
runx
(
xf
func
())
(
err
error
)
{
//here := my.FuncName()
here
:=
myname
.
Func
()
defer
exc
.
Catch
(
func
(
e
*
exc
.
Error
)
{
err
=
exc
.
Addcallingcontext
(
here
,
e
)
})
xf
()
return
}
// XXX move me out of here ?
type
workGroup
struct
{
*
errgroup
.
Group
}
// like errgroup.Go but translates exceptions to errors
func
(
wg
*
workGroup
)
Gox
(
xf
func
())
{
wg
.
Go
(
func
()
error
{
return
runx
(
xf
)
})
}
func
WorkGroup
()
*
workGroup
{
return
&
workGroup
{
&
errgroup
.
Group
{}}
}
func
WorkGroupCtx
(
ctx
context
.
Context
)
(
*
workGroup
,
context
.
Context
)
{
g
,
ctx
:=
errgroup
.
WithContext
(
ctx
)
return
&
workGroup
{
g
},
ctx
}
////////////////////////////////////////
func
xclose
(
c
io
.
Closer
)
{
err
:=
c
.
Close
()
exc
.
Raiseif
(
err
)
}
func
xsend
(
c
*
Conn
,
pkt
*
PktBuf
)
{
err
:=
c
.
Send
(
pkt
)
if
err
!=
nil
{
//t.Fatal(err) // XXX make sure this happens in main goroutine
panic
(
"TODO"
)
}
exc
.
Raiseif
(
err
)
}
func
xrecv
(
c
*
Conn
)
*
PktBuf
{
pkt
,
err
:=
c
.
Recv
()
if
err
!=
nil
{
//t.Fatal(err) // XXX make sure this happens in main goroutine
panic
(
"TODO"
)
}
exc
.
Raiseif
(
err
)
return
pkt
}
func
xsendPkt
(
nl
*
NodeLink
,
pkt
*
PktBuf
)
{
err
:=
nl
.
sendPkt
(
pkt
)
if
err
!=
nil
{
panic
(
"TODO"
)
}
exc
.
Raiseif
(
err
)
}
func
xrecvPkt
(
nl
*
NodeLink
)
*
PktBuf
{
pkt
,
err
:=
nl
.
recvPkt
()
if
err
!=
nil
{
panic
(
"TODO"
)
}
exc
.
Raiseif
(
err
)
return
pkt
}
/*
func xspawn(funcv ...func()) {
for f := range funcv {
go func() {
defer func() {
e := recover()
if e == nil {
return
}
}
}
}
}
*/
// // run f in a goroutine; check its return error; if != nil -> t.Fatal in main goroutine
// func xgo(t *testing.T, f func() error) {
// var err error
// done := make(chan struct{})
// go func() {
// err = f()
// close(done)
// if err != nil {
// panic(err) // XXX temp - see vvv
// }
// }()
// /* FIXME below just blocks main goroutine waiting for f() to complete
// <-done
// if err != nil {
// t.Fatal(err) // TODO adjust lineno (report calling location, not here)
// }
// */
// }
func
xwait
(
t
*
testing
.
T
,
w
interface
{
Wait
()
error
})
{
err
:=
w
.
Wait
()
if
err
!=
nil
{
exc
.
Raiseif
(
err
)
/*
if err != nil { // XXX -> exc.Raise ?
t.Fatal(err) // TODO include caller location
}
*/
}
// Prepare PktBuf with content
func
mkpkt
(
msgid
uint32
,
msgcode
uint16
,
payload
[]
byte
)
*
PktBuf
{
pkt
:=
&
PktBuf
{
make
([]
byte
,
PktHeadLen
+
len
(
payload
))}
pkt
h
:=
pkt
.
Header
()
pkt
h
.
MsgId
=
hton32
(
msgid
)
pkt
h
.
MsgCode
=
hton16
(
msgcode
)
pkt
h
.
Len
=
hton32
(
PktHeadLen
+
4
)
h
:=
pkt
.
Header
()
h
.
MsgId
=
hton32
(
msgid
)
h
.
MsgCode
=
hton16
(
msgcode
)
h
.
Len
=
hton32
(
PktHeadLen
+
4
)
copy
(
pkt
.
Payload
(),
payload
)
return
pkt
}
// Verify PktBuf is as expected
func
xverifyPkt
(
pkt
*
PktBuf
,
msgid
uint32
,
msgcode
uint16
,
payload
[]
byte
)
{
errv
:=
xerr
.
Errorv
{}
h
:=
pkt
.
Header
()
// TODO include caller location
if
ntoh32
(
h
.
MsgId
)
!=
msgid
{
errv
.
Appendf
(
"header: unexpected msgid %v (want %v)"
,
ntoh32
(
h
.
MsgId
),
msgid
)
}
if
ntoh16
(
h
.
MsgCode
)
!=
msgcode
{
errv
.
Appendf
(
"header: unexpected msgcode %v (want %v)"
,
ntoh16
(
h
.
MsgCode
),
msgcode
)
}
if
ntoh32
(
h
.
Len
)
!=
uint32
(
PktHeadLen
+
len
(
payload
))
{
errv
.
Appendf
(
"header: unexpected length %v (want %v)"
,
ntoh32
(
h
.
Len
),
PktHeadLen
+
len
(
payload
))
}
if
!
bytes
.
Equal
(
pkt
.
Payload
(),
payload
)
{
errv
.
Appendf
(
"payload differ"
)
// XXX also print payload ?
}
exc
.
Raiseif
(
errv
.
Err
()
)
}
// delay a bit
// needed e.g. to test Close interaction with waiting read or write
// (we cannot easily sync and make sure e.g. read is started and became asleep)
...
...
@@ -130,32 +154,34 @@ func nodeLinkPipe() (nl1, nl2 *NodeLink) {
func
TestNodeLink
(
t
*
testing
.
T
)
{
// TODO catch exception -> add proper location from it -> t.Fatal (see git-backup)
nl1
,
nl2
:=
nodeLinkPipe
()
// Close vs recvPkt
g
:=
&
errgroup
.
Group
{}
g
.
Go
(
func
()
error
{
wg
:=
WorkGroup
()
wg
.
Gox
(
func
()
{
tdelay
()
return
nl1
.
Close
(
)
xclose
(
nl1
)
})
pkt
,
err
:=
nl1
.
recvPkt
()
if
!
(
pkt
==
nil
&&
err
==
io
.
ErrClosedPipe
)
{
t
.
Fatalf
(
"NodeLink.recvPkt() after close: pkt = %v err = %v"
,
pkt
,
err
)
}
xwait
(
t
,
g
)
xwait
(
t
,
w
g
)
// Close vs sendPkt
g
=
&
errgroup
.
Group
{}
g
.
Go
(
func
()
error
{
wg
=
WorkGroup
()
wg
.
Gox
(
func
()
{
tdelay
()
return
nl2
.
Close
(
)
xclose
(
nl2
)
})
pkt
=
&
PktBuf
{[]
byte
(
"data"
)}
err
=
nl2
.
sendPkt
(
pkt
)
if
err
!=
io
.
ErrClosedPipe
{
t
.
Fatalf
(
"NodeLink.sendPkt() after close: err = %v"
,
err
)
}
xwait
(
t
,
g
)
xwait
(
t
,
w
g
)
// TODO (?) every func: run with exception catcher (including t.Fatal)
// if caught:
...
...
@@ -165,10 +191,14 @@ func TestNodeLink(t *testing.T) {
nl1
,
nl2
=
nodeLinkPipe
()
// check raw exchange works
g
,
ctx
:=
errgroup
.
WithContext
(
context
.
Background
())
g
.
Go
(
func
()
error
{
wg
,
ctx
:=
WorkGroupCtx
(
context
.
Background
())
wg
.
Gox
(
func
()
{
// send ping; wait for pong
pkt
:=
mkpkt
(
1
,
2
,
[]
byte
(
"ping"
))
xsendPkt
(
nl1
,
pkt
)
pkt
=
xrecvPkt
(
nl1
)
xverifyPkt
(
pkt
,
3
,
4
,
[]
byte
(
"pong"
))
/*
err := nl1.sendPkt(pkt)
if err != nil {
t.Errorf("nl1.sendPkt: %v", err)
...
...
@@ -179,28 +209,28 @@ func TestNodeLink(t *testing.T) {
t.Errorf("nl1.recvPkt: %v", err)
return err
}
// TODO vvv also check msgid, msgcode
if
!
bytes
.
Equal
(
pkt
.
Payload
(),
[]
byte
(
"pong"
))
{
// XXX vvv -> util ?
e
:=
fmt
.
Errorf
(
"nl1 received: %v ; want
\"
pong
\"
"
,
pkt
.
Data
)
t
.
Error
(
e
)
return
e
err = verifyPkt("nl1 received", t, pkt, 3, 4, []byte("pong"))
if err != nil {
return err
}
return nil
*/
})
g
.
Go
(
func
()
error
{
wg
.
Gox
(
func
()
{
// wait for ping; send pong
pkt
=
xrecvPkt
(
nl2
)
xverifyPkt
(
pkt
,
1
,
2
,
[]
byte
(
"ping"
))
pkt
=
mkpkt
(
3
,
4
,
[]
byte
(
"pong"
))
xsendPkt
(
nl2
,
pkt
)
/*
pkt, err := nl2.recvPkt()
if err != nil {
t.Errorf("nl2.recvPkt: %v", err)
return err
}
// TODO vvv also check msgid, msgcode
if
!
bytes
.
Equal
(
pkt
.
Payload
(),
[]
byte
(
"ping"
))
{
// XXX vvv -> util ?
e
:=
fmt
.
Errorf
(
"nl2 received: %v ; want
\"
ping
\"
"
,
pkt
.
Data
)
t
.
Error
(
e
)
return
e
err = verifyPkt("nl2 received", t, pkt, 1, 2, []byte("ping"))
if err != nil {
return err
}
pkt = mkpkt(3, 4, []byte("pong"))
err = nl2.sendPkt(pkt)
...
...
@@ -209,47 +239,20 @@ func TestNodeLink(t *testing.T) {
return err
}
return nil
})
g2
:=
&
errgroup
.
Group
{}
g2
.
Go
(
func
()
error
{
<-
ctx
.
Done
()
ev
:=
xerror
.
Errorv
{}
ev
.
addif
(
nl1
.
Close
()
)
ev
.
addif
(
nl2
.
Close
()
)
return
ev
.
Reduce
()
// nil if len==0; [0] if len==1; [...] otherwise
/*
for c := range []io.Closer{nl1, nl2} {
err := c.Close()
if err != nil {
ev = append(ev, err)
}
}
*/
/*
err := nl1.Close()
err2 := nl2.Close()
if err == nil {
err = err2
}
*/
})
xwait
(
g
)
xwait
(
g2
)
// close nodelinks either when checks are done, or upon first error
closed
:=
make
(
chan
struct
{}
)
go
func
()
{
wgclose
:=
WorkGroup
(
)
wgclose
.
Gox
(
func
()
{
<-
ctx
.
Done
()
nl1
.
Close
()
// XXX err
nl2
.
Close
()
// XXX err
close
(
closed
)
}()
xclose
(
nl1
)
xclose
(
nl2
)
})
xwait
(
t
,
wg
)
xwait
(
t
,
wgclose
)
xwait
(
t
,
g
)
<-
closed
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment