This commit is contained in:
Armon Dadgar 2014-05-16 15:49:47 -07:00
parent d5b1330227
commit 9470f9a5a2
18 changed files with 26 additions and 26 deletions

View File

@ -1,15 +1,15 @@
package agent package agent
import ( import (
"errors"
"fmt" "fmt"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/serf/serf" "github.com/hashicorp/serf/serf"
"net/http" "net/http"
"os" "os"
"testing" "testing"
"time" "time"
"errors"
) )
func TestHTTPAgentServices(t *testing.T) { func TestHTTPAgentServices(t *testing.T) {

View File

@ -2,8 +2,8 @@ package agent
import ( import (
"fmt" "fmt"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"

View File

@ -2,8 +2,8 @@ package agent
import ( import (
"fmt" "fmt"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"github.com/miekg/dns" "github.com/miekg/dns"
"os" "os"
"strings" "strings"

View File

@ -2,8 +2,8 @@ package agent
import ( import (
"fmt" "fmt"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"

View File

@ -3,8 +3,8 @@ package agent
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"

View File

@ -1,8 +1,8 @@
package agent package agent
import ( import (
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"os" "os"
"reflect" "reflect"
"testing" "testing"

View File

@ -1,15 +1,15 @@
package agent package agent
import ( import (
"errors"
"fmt" "fmt"
"github.com/hashicorp/serf/serf"
"github.com/hashicorp/consul/testutil" "github.com/hashicorp/consul/testutil"
"github.com/hashicorp/serf/serf"
"io" "io"
"net" "net"
"os" "os"
"strings" "strings"
"testing" "testing"
"errors"
"time" "time"
) )

View File

@ -1,9 +1,9 @@
package agent package agent
import ( import (
"github.com/hashicorp/consul/testutil"
"os" "os"
"testing" "testing"
"github.com/hashicorp/consul/testutil"
) )
func TestStatusLeader(t *testing.T) { func TestStatusLeader(t *testing.T) {

View File

@ -3,8 +3,8 @@ package agent
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"io" "io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"

View File

@ -1,13 +1,13 @@
package command package command
import ( import (
"errors"
"fmt" "fmt"
"github.com/hashicorp/consul/testutil" "github.com/hashicorp/consul/testutil"
"github.com/hashicorp/serf/serf" "github.com/hashicorp/serf/serf"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
"strings" "strings"
"testing" "testing"
"errors"
) )
func TestForceLeaveCommand_implements(t *testing.T) { func TestForceLeaveCommand_implements(t *testing.T) {

View File

@ -2,8 +2,8 @@ package consul
import ( import (
"fmt" "fmt"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"net" "net"
"os" "os"
"testing" "testing"

View File

@ -1,8 +1,8 @@
package consul package consul
import ( import (
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"os" "os"
"testing" "testing"
) )

View File

@ -1,8 +1,8 @@
package consul package consul
import ( import (
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"os" "os"
"testing" "testing"
) )

View File

@ -1,8 +1,8 @@
package consul package consul
import ( import (
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"os" "os"
"testing" "testing"
) )

View File

@ -1,13 +1,13 @@
package consul package consul
import ( import (
"errors"
"fmt" "fmt"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/testutil"
"github.com/hashicorp/serf/serf" "github.com/hashicorp/serf/serf"
"os" "os"
"testing" "testing"
"errors"
"time" "time"
) )

View File

@ -1,6 +1,7 @@
package consul package consul
import ( import (
"errors"
"fmt" "fmt"
"github.com/hashicorp/consul/testutil" "github.com/hashicorp/consul/testutil"
"io/ioutil" "io/ioutil"
@ -8,7 +9,6 @@ import (
"os" "os"
"testing" "testing"
"time" "time"
"errors"
) )
var nextPort = 15000 var nextPort = 15000

View File

@ -1,9 +1,9 @@
package testutil package testutil
import ( import (
"time"
"testing"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"testing"
"time"
) )
type testFn func() (bool, error) type testFn func() (bool, error)