1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
|
Last-Update: 2019-11-28
Forwarded: not-needed
Bug-Upstream: https://github.com/hashicorp/nomad/issues/6785
Author: Dmitry Smirnov <onlyjob@debian.org>
Description: fix FTBFS with Consul 1.5.
--- a/command/agent/operator_endpoint_test.go
+++ b/command/agent/operator_endpoint_test.go
@@ -8,9 +8,9 @@
"strings"
"testing"
"time"
- "github.com/hashicorp/consul/testutil/retry"
+ "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
--- a/internal/testing/apitests/operator_autopilot_test.go
+++ b/internal/testing/apitests/operator_autopilot_test.go
@@ -4,9 +4,9 @@
"testing"
"fmt"
- "github.com/hashicorp/consul/testutil/retry"
+ "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/testutil"
"github.com/stretchr/testify/require"
)
--- a/internal/testing/apitests/operator_test.go
+++ b/internal/testing/apitests/operator_test.go
@@ -2,9 +2,9 @@
import (
"testing"
- "github.com/hashicorp/consul/testutil/retry"
+ "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/nomad/api"
"github.com/stretchr/testify/require"
)
--- a/nomad/autopilot_test.go
+++ b/nomad/autopilot_test.go
@@ -6,9 +6,9 @@
"fmt"
"github.com/hashicorp/consul/agent/consul/autopilot"
- "github.com/hashicorp/consul/testutil/retry"
+ "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/nomad/testutil"
"github.com/hashicorp/raft"
"github.com/hashicorp/serf/serf"
)
--- a/nomad/leader_test.go
+++ b/nomad/leader_test.go
@@ -6,9 +6,9 @@
"strconv"
"testing"
"time"
- "github.com/hashicorp/consul/testutil/retry"
+ "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/go-hclog"
memdb "github.com/hashicorp/go-memdb"
"github.com/hashicorp/go-version"
"github.com/hashicorp/nomad/helper"
--- a/helper/freeport/freeport_test.go
+++ b/helper/freeport/freeport_test.go
@@ -6,9 +6,9 @@
"net"
"sync"
"testing"
- "github.com/hashicorp/consul/testutil/retry"
+ "github.com/hashicorp/consul/sdk/testutil/retry"
)
// reset will reverse the setup from initialize() and then redo it (for tests)
func reset() {
|