Merge pull request #5580 from tianon/update-vendor-versions

Update vendored deps that have a proper version number to use said specific versions

hack/vendor.sh

@@ -59,5 +59,5 @@ rm -rf src/code.google.com/p/go
 mkdir -p src/code.google.com/p/go/src/pkg/archive
 mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar
 
-clone git github.com/godbus/dbus cb98efbb933d8389ab549a060e880ea3c375d213
+clone git github.com/godbus/dbus v1
-clone git github.com/coreos/go-systemd 4c14ed39b8a643ac44b4f95b5a53c00e94261475
+clone git github.com/coreos/go-systemd v1

vendor/src/github.com/coreos/go-systemd/dbus/methods_test.go

@@ -18,12 +18,13 @@ package dbus
 
 import (
 	"fmt"
-	"github.com/guelfey/go.dbus"
 	"math/rand"
 	"os"
 	"path/filepath"
 	"reflect"
 	"testing"
+
+	"github.com/godbus/dbus"
 )
 
 func setupConn(t *testing.T) *Conn {

vendor/src/github.com/coreos/go-systemd/dbus/set.go

@@ -21,6 +21,13 @@ func (s *set) Length() (int) {
 	return len(s.data)
 }
 
+func (s *set) Values() (values []string) {
+	 for val, _ := range s.data {
+		values = append(values, val)
+	 }
+	 return
+}
+
 func newSet() (*set) {
 	return &set{make(map[string] bool)}
 }

vendor/src/github.com/coreos/go-systemd/dbus/set_test.go

@@ -18,9 +18,22 @@ func TestBasicSetActions(t *testing.T) {
 		t.Fatal("set should contain 'foo'")
 	}
 
+	v := s.Values()
+	if len(v) != 1 {
+		t.Fatal("set.Values did not report correct number of values")
+	}
+	if v[0] != "foo" {
+		t.Fatal("set.Values did not report value")
+	}
+
 	s.Remove("foo")
 
 	if s.Contains("foo") {
 		t.Fatal("set should not contain 'foo'")
 	}
+
+	v = s.Values()
+	if len(v) != 0 {
+		t.Fatal("set.Values did not report correct number of values")
+	}
 }

vendor/src/github.com/coreos/go-systemd/fixtures/enable-disable.service

@@ -0,0 +1,5 @@
+[Unit]
+Description=enable disable test
+
+[Service]
+ExecStart=/bin/sleep 400