s/wercker/travis

davecheney · davecheney · commit fe1bd71a2fef · 2015-12-25T18:24:07.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,19 @@
+language: go
+go_import_path: github.com/pkg/sftp
+go:
+  - 1.5.2
+  - 1.4.3
+  - tip
+
+sudo: false
+
+addons:
+  ssh_known_hosts:
+      - bitbucket.org
+
+install:
+  - go get -t -v ./...
+  - ssh-keygen -t rsa -q -P "" -f /home/travis/.ssh/id_rsa
+
+script:
+  - go test -integration -v ./...
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ sftp
 
 The `sftp` package provides support for file system operations on remote ssh servers using the SFTP subsystem.
 
-[![wercker status](https://app.wercker.com/status/7d3e9b916954ac3a7ed15a457938bac4/s/master "wercker status")](https://app.wercker.com/project/bykey/7d3e9b916954ac3a7ed15a457938bac4)
+[!"unix status")](https://travis-ci.org/pkg/sftp.svg)
 
 usage and examples
 ------------------
diff --git a/server_integration_test.go b/server_integration_test.go
@@ -36,14 +36,6 @@ const (
 	OPENSSH_SFTP = false
 )
 
-/***********************************************************************************************
-
-
-SSH server scaffolding; very simple, no strict auth. This is for unit testing, not real servers
-
-
-***********************************************************************************************/
-
 var (
 	hostPrivateKeySigner ssh.Signer
 	privKey              = []byte(`
@@ -350,15 +342,16 @@ func testServer(t *testing.T, useSubsystem bool, readonly bool) (net.Listener, s
 		for {
 			conn, err := listener.Accept()
 			if err != nil {
-				fmt.Fprintf(sshServerDebugStream, "ssh server socket closed\n")
+				fmt.Fprintf(sshServerDebugStream, "ssh server socket closed: %v\n", err)
 				break
 			}
 
 			go func() {
 				defer conn.Close()
 				sshSvr, err := sshServerFromConn(conn, useSubsystem, basicServerConfig())
 				if err != nil {
-					t.Fatal(err)
+					t.Error(err)
+					return
 				}
 				err = sshSvr.Wait()
 				fmt.Fprintf(sshServerDebugStream, "ssh server finished, err: %v\n", err)
@@ -374,10 +367,18 @@ func runSftpClient(t *testing.T, script string, path string, host string, port i
 	if _, err := os.Stat(*testSftpClientBin); err != nil {
 		t.Skip("sftp client binary unavailable")
 	}
-	cmd := exec.Command(*testSftpClientBin /*"-vvvv",*/, "-b", "-", "-o", "StrictHostKeyChecking=no", "-o", "LogLevel=ERROR", "-o", "UserKnownHostsFile /dev/null", "-P", fmt.Sprintf("%d", port), fmt.Sprintf("%s:%s", host, path))
-	stdout := &bytes.Buffer{}
+	args := []string{
+		// "-vvvv",
+		"-b", "-",
+		"-o", "StrictHostKeyChecking=no",
+		"-o", "LogLevel=ERROR",
+		"-o", "UserKnownHostsFile /dev/null",
+		"-P", fmt.Sprintf("%d", port), fmt.Sprintf("%s:%s", host, path),
+	}
+	cmd := exec.Command(*testSftpClientBin, args...)
+	var stdout bytes.Buffer
 	cmd.Stdin = bytes.NewBufferString(script)
-	cmd.Stdout = stdout
+	cmd.Stdout = &stdout
 	cmd.Stderr = sftpClientDebugStream
 	if err := cmd.Start(); err != nil {
 		return "", err
@@ -426,12 +427,14 @@ ls -l /usr/bin/
 			goWords := spaceRegex.Split(goLine, -1)
 			opWords := spaceRegex.Split(opLine, -1)
 			// allow words[2] and [3] to be different as these are users & groups
+			// also allow words[1] to differ as the link count for directories like
+			// proc is unstable during testing as processes are created/destroyed.
 			for j, goWord := range goWords {
 				if j > len(opWords) {
 					bad = true
 				}
 				opWord := opWords[j]
-				if goWord != opWord && j != 2 && j != 3 {
+				if goWord != opWord && j != 1 && j != 2 && j != 3 {
 					bad = true
 				}
 			}
diff --git a/wercker.yml b/wercker.yml
