From 0a0fb6f86d53f48961aee3b848d7cad0d43030b1 Mon Sep 17 00:00:00 2001
From: Michael Schurter <mschurter@hashicorp.com>
Date: Wed, 19 Dec 2018 17:08:24 -0800
Subject: [PATCH] test: re-eanble periodic fingerprint test

---
 client/client_test.go | 20 ++++++++++++++------
 client/testing.go     |  4 +++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/client/client_test.go b/client/client_test.go
index 715265536..6e01a8cb7 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/hashicorp/nomad/nomad/structs"
 	nconfig "github.com/hashicorp/nomad/nomad/structs/config"
 	"github.com/hashicorp/nomad/plugins/device"
+	"github.com/hashicorp/nomad/plugins/shared/catalog"
 	psstructs "github.com/hashicorp/nomad/plugins/shared/structs"
 	"github.com/hashicorp/nomad/testutil"
 	"github.com/stretchr/testify/assert"
@@ -163,15 +164,22 @@ func TestClient_Fingerprint(t *testing.T) {
 	})
 }
 
+// TestClient_Fingerprint_Periodic asserts that driver node attributes are
+// periodically fingerprinted.
 func TestClient_Fingerprint_Periodic(t *testing.T) {
-	t.Skip("missing mock driver plugin implementation")
 	t.Parallel()
 
 	c1, cleanup := TestClient(t, func(c *config.Config) {
-		c.Options = map[string]string{
-			"test.shutdown_periodic_after":    "true",
-			"test.shutdown_periodic_duration": "1",
+		confs := []*nconfig.PluginConfig{
+			&nconfig.PluginConfig{
+				Name: "mock_driver",
+				Config: map[string]interface{}{
+					"shutdown_periodic_after":    true,
+					"shutdown_periodic_duration": time.Second,
+				},
+			},
 		}
+		c.PluginLoader = catalog.TestPluginLoaderWithOptions(t, "", nil, confs)
 	})
 	defer cleanup()
 
@@ -219,10 +227,10 @@ func TestClient_Fingerprint_Periodic(t *testing.T) {
 				return false, fmt.Errorf("mock driver is nil when it should be set on node Drivers")
 			}
 			if mockDriverInfo.Detected {
-				return false, fmt.Errorf("mock driver should be set as detected")
+				return false, fmt.Errorf("mock driver should not be set as detected")
 			}
 			if mockDriverInfo.Healthy {
-				return false, fmt.Errorf("mock driver should be set as healthy")
+				return false, fmt.Errorf("mock driver should not be set as healthy")
 			}
 			if mockDriverInfo.HealthDescription == "" {
 				return false, fmt.Errorf("mock driver description should not be empty")
diff --git a/client/testing.go b/client/testing.go
index 4a9ac8096..1a4ab5d13 100644
--- a/client/testing.go
+++ b/client/testing.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/nomad/helper/testlog"
 	"github.com/hashicorp/nomad/plugins/shared/catalog"
 	"github.com/hashicorp/nomad/plugins/shared/singleton"
-	"github.com/mitchellh/go-testing-interface"
+	testing "github.com/mitchellh/go-testing-interface"
 )
 
 // TestClient creates an in-memory client for testing purposes and returns a
@@ -40,6 +40,8 @@ func TestClient(t testing.T, cb func(c *config.Config)) (*Client, func() error)
 	// Set the plugin loaders
 	if conf.PluginLoader == nil {
 		conf.PluginLoader = catalog.TestPluginLoaderWithOptions(t, "", conf.Options, nil)
+	}
+	if conf.PluginSingletonLoader == nil {
 		conf.PluginSingletonLoader = singleton.NewSingletonLoader(logger, conf.PluginLoader)
 	}
 	catalog := consul.NewMockCatalog(logger)