Merge pull request #211 from arschles/pkt-test

fix(pkg/sshd/server_test.go): write test for gitPktLine (WIP)

Author: arschles

pkg/sshd/server.go

@@ -334,8 +334,7 @@ func Ping(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
 	return nil, nil
 }
 
-// gitPktLine writes a line following the git protocol
-// https://github.com/git/git/blob/master/Documentation/technical/pack-protocol.txt
+// gitPktLine writes a line following the pkt-line git protocol. See https://github.com/git/git/blob/master/Documentation/technical/protocol-common.txt for the protocol and https://github.com/git/git/blob/master/Documentation/technical/pack-protocol.txt for its usage.
 func gitPktLine(w io.Writer, s string) error {
 	_, err := fmt.Fprintf(w, "%04x%s", len(s)+4, s)
 	return err

pkg/sshd/server_test.go

@@ -1,13 +1,16 @@
 package sshd
 
 import (
+	"bytes"
+	"fmt"
 	"net"
 	"testing"
 	"time"
 
 	"github.com/deis/builder/pkg/controller"
 
 	"github.com/Masterminds/cookoo"
+	"github.com/arschles/assert"
 	"github.com/deis/builder/pkg/cleaner"
 	"golang.org/x/crypto/ssh"
 )
@@ -19,6 +22,17 @@ const (
 	gitHome            = "/git"
 )
 
+func TestGitPktLine(t *testing.T) {
+	b := new(bytes.Buffer)
+	str := "hello world"
+	err := gitPktLine(b, str)
+	assert.NoErr(t, err)
+	outStr := string(b.Bytes())
+	assert.True(t, len(outStr) > 4, "output string <= 4 chars")
+	assert.Equal(t, outStr[:4], fmt.Sprintf("%04x", len(str)+4), "hex prefix")
+	assert.Equal(t, outStr[4:], str, "remainder of string")
+}
+
 // TestServer tests the SSH server.
 //
 // This listens on the non-standard port 2244 of localhost. This will generate