Bring in the testclock from juju/clock.

MalloZup · Aug 20, 2018 · a517fc6 · a517fc6
1 parent 9e7986d
commit a517fc6
Show file tree

Hide file tree

Showing 80 changed files with 94 additions and 22 deletions.
diff --git a/api/apiclient_test.go b/api/apiclient_test.go
@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/juju/clock"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/errors"
 	proxyutils "github.com/juju/proxy"
 	"github.com/juju/testing"

diff --git a/api/base/mocks/clientfacade_mock.go b/api/base/mocks/clientfacade_mock.go
diff --git a/api/base/mocks/facadecaller_mock.go b/api/base/mocks/facadecaller_mock.go
diff --git a/api/crossmodelrelations/macarooncache_test.go b/api/crossmodelrelations/macarooncache_test.go
@@ -6,7 +6,7 @@ package crossmodelrelations_test
 import (
 	"time"
 
-	"github.com/juju/testing"
+	"github.com/juju/clock/testclock"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/macaroon.v2-unstable"

diff --git a/api/monitor_internal_test.go b/api/monitor_internal_test.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	gc "gopkg.in/check.v1"
 

diff --git a/apiserver/authentication/user_test.go b/apiserver/authentication/user_test.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/testing"

diff --git a/apiserver/common/crossmodel/auth_test.go b/apiserver/common/crossmodel/auth_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/juju/testing"
+	"github.com/juju/clock/testclock"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils"
 	gc "gopkg.in/check.v1"

diff --git a/apiserver/common/mocks/mock_upgradeseries.go b/apiserver/common/mocks/mock_upgradeseries.go
diff --git a/apiserver/facades/agent/presence/util_test.go b/apiserver/facades/agent/presence/util_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/juju/clock"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/errors"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"

diff --git a/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go b/apiserver/facades/controller/caasunitprovisioner/provisioner_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/juju/clock"
-	"github.com/juju/testing"
+	"github.com/juju/clock/testclock"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"

diff --git a/apiserver/listener_test.go b/apiserver/listener_test.go
@@ -8,6 +8,7 @@ import (
 	"net"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/apiserver/logsink/logsink_test.go b/apiserver/logsink/logsink_test.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/loggo"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"

diff --git a/apiserver/observer/metricobserver/observer_test.go b/apiserver/observer/metricobserver/observer_test.go
@@ -6,6 +6,7 @@ package metricobserver_test
 import (
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/prometheus/client_golang/prometheus"

diff --git a/apiserver/observer/metricobserver/observerfactory_test.go b/apiserver/observer/metricobserver/observerfactory_test.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/prometheus/client_golang/prometheus"

diff --git a/apiserver/observer/recorder_test.go b/apiserver/observer/recorder_test.go
@@ -6,6 +6,7 @@ package observer_test
 import (
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/apiserver/observer/request_notifier_test.go b/apiserver/observer/request_notifier_test.go
@@ -6,6 +6,7 @@ package observer_test
 import (
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/loggo"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"

diff --git a/apiserver/pinger_test.go b/apiserver/pinger_test.go
@@ -6,6 +6,7 @@ package apiserver_test
 import (
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/testing"

diff --git a/cmd/juju/controller/kill_test.go b/cmd/juju/controller/kill_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/juju/clock"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/cmd"
 	"github.com/juju/cmd/cmdtesting"
 	"github.com/juju/errors"

diff --git a/container/kvm/sync_internal_test.go b/container/kvm/sync_internal_test.go
@@ -14,6 +14,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/errors"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"

diff --git a/core/auditlog/auditlog_test.go b/core/auditlog/auditlog_test.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/core/presence/presence_test.go b/core/presence/presence_test.go
@@ -6,6 +6,7 @@ package presence_test
 import (
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/network/debinterfaces/activate_test.go b/network/debinterfaces/activate_test.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/juju/clock"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/juju/network/debinterfaces"
 	"github.com/juju/testing"
 	gc "gopkg.in/check.v1"

diff --git a/network/scriptrunner_test.go b/network/scriptrunner_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/juju/clock"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/provider/azure/internal/azureauth/serviceprincipal_test.go b/provider/azure/internal/azureauth/serviceprincipal_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/adal"
 	"github.com/Azure/go-autorest/autorest/mocks"
 	"github.com/Azure/go-autorest/autorest/to"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils"

diff --git a/provider/ec2/securitygroups_test.go b/provider/ec2/securitygroups_test.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/juju/clock"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	amzec2 "gopkg.in/amz.v3/ec2"

diff --git a/provider/lxd/credentials_mock_test.go b/provider/lxd/credentials_mock_test.go
diff --git a/provider/lxd/net_mock_test.go b/provider/lxd/net_mock_test.go
diff --git a/provider/lxd/provider_mock_test.go b/provider/lxd/provider_mock_test.go
diff --git a/provider/lxd/server_mock_test.go b/provider/lxd/server_mock_test.go
diff --git a/provider/oci/testing/mocks_compute.go b/provider/oci/testing/mocks_compute.go
diff --git a/provider/oci/testing/mocks_firewall.go b/provider/oci/testing/mocks_firewall.go
diff --git a/provider/oci/testing/mocks_identity.go b/provider/oci/testing/mocks_identity.go
diff --git a/provider/oci/testing/mocks_networking.go b/provider/oci/testing/mocks_networking.go
diff --git a/provider/oci/testing/mocks_storage.go b/provider/oci/testing/mocks_storage.go
diff --git a/provider/vsphere/internal/vsphereclient/createvm_test.go b/provider/vsphere/internal/vsphereclient/createvm_test.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/vmware/govmomi/vim25/mo"

diff --git a/state/logdb/buf_test.go b/state/logdb/buf_test.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/state/status_history_test.go b/state/status_history_test.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/collections/set"
-	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/arch"
 	gc "gopkg.in/check.v1"

diff --git a/state/upgrades_test.go b/state/upgrades_test.go
@@ -8,10 +8,10 @@ import (
 	"sort"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
-	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils"
 	"github.com/kr/pretty"

diff --git a/utils/scriptrunner/scriptrunner_test.go b/utils/scriptrunner/scriptrunner_test.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/juju/clock"
+	"github.com/juju/clock/testclock"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

diff --git a/worker/apiserver/manifold_test.go b/worker/apiserver/manifold_test.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/errors"
 	"github.com/juju/pubsub"
 	"github.com/juju/testing"

diff --git a/worker/apiserver/worker_test.go b/worker/apiserver/worker_test.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/pubsub"
 	"github.com/juju/testing"
 	gc "gopkg.in/check.v1"

diff --git a/worker/caasoperator/caasoperator_test.go b/worker/caasoperator/caasoperator_test.go
@@ -11,6 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/juju/clock/testclock"
 	"github.com/juju/errors"
 	"github.com/juju/juju/core/life"
 	"github.com/juju/os/series"