1 files changed, 14 insertions, 9 deletions

diff --git a/xdelta3/go/src/xdelta/rstream.go b/xdelta3/go/src/xdelta/rstream.go
index 3e7265f..3f520d7 100644
--- a/xdelta3/go/src/xdelta/rstream.go
+++ b/xdelta3/go/src/xdelta/rstream.go
@@ -11,25 +11,30 @@ const (
 )
 
 func WriteRstreams(t *TestGroup, seed, offset, len int64,
-        first, second io.WriteCloser) {
-        go writeOne(t, seed, 0, len, first)
-        go writeOne(t, seed, offset, len, second)
+        src, tgt io.WriteCloser) {
+        t.Go("src", func (g Goroutine) {
+                go writeOne(g, seed, 0, len, src)
+        })
+        t.Go("tgt", func (g Goroutine) {
+                go writeOne(g, seed, offset, len, tgt)
+        })
 }
 
-func writeOne(t *TestGroup, seed, offset, len int64, stream io.WriteCloser) error {
-        t.WaitGroup.Add(1)
+func writeOne(g Goroutine, seed, offset, len int64, stream io.WriteCloser) {
         if offset != 0 {
                 // Fill with other random data until the offset
                 if err := writeRand(rand.New(rand.NewSource(^seed)), offset, stream); err != nil {
-                        return err
+                        g.Panic(err)
                 }
         }
         if err := writeRand(rand.New(rand.NewSource(seed)),
                 len - offset, stream); err != nil {
-                return err
+                g.Panic(err)
+        }
+        if err := stream.Close(); err != nil {
+                g.Panic(err)
         }
-        t.WaitGroup.Done()
-        return stream.Close()
+        g.OK()
 }
 
 func writeRand(r *rand.Rand, len int64, s io.Writer) error {