From 4dfe0d60f3593360b9d43d8dd38981e971c9b642 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 30 May 2018 14:02:20 -0700 Subject: hooks: Rename Hooks() output to extensionStageHooks To more clearly distinguish between the extensionStages input to New() (a slice of strings) and the map output from Hooks(). Signed-off-by: W. Trevor King Closes: #855 Approved by: rhatdan --- pkg/hooks/hooks_test.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'pkg/hooks/hooks_test.go') diff --git a/pkg/hooks/hooks_test.go b/pkg/hooks/hooks_test.go index 8bd89f56f..b93a1d54d 100644 --- a/pkg/hooks/hooks_test.go +++ b/pkg/hooks/hooks_test.go @@ -54,7 +54,7 @@ func TestGoodNew(t *testing.T) { } config := &rspec.Spec{} - extensionStages, err := manager.Hooks(config, map[string]string{}, false) + extensionStageHooks, err := manager.Hooks(config, map[string]string{}, false) if err != nil { t.Fatal(err) } @@ -91,8 +91,8 @@ func TestGoodNew(t *testing.T) { }, }, config.Hooks) - var nilExtensionStages map[string][]rspec.Hook - assert.Equal(t, nilExtensionStages, extensionStages) + var nilExtensionStageHooks map[string][]rspec.Hook + assert.Equal(t, nilExtensionStageHooks, extensionStageHooks) } func TestBadNew(t *testing.T) { @@ -142,14 +142,14 @@ func TestBrokenMatch(t *testing.T) { Args: []string{"/bin/sh"}, }, } - extensionStages, err := manager.Hooks(config, map[string]string{}, false) + extensionStageHooks, err := manager.Hooks(config, map[string]string{}, false) if err == nil { t.Fatal("unexpected success") } assert.Regexp(t, "^matching hook \"a\\.json\": command: error parsing regexp: .*", err.Error()) - var nilExtensionStages map[string][]rspec.Hook - assert.Equal(t, nilExtensionStages, extensionStages) + var nilExtensionStageHooks map[string][]rspec.Hook + assert.Equal(t, nilExtensionStageHooks, extensionStageHooks) } func TestInvalidStage(t *testing.T) { @@ -168,14 +168,14 @@ func TestInvalidStage(t *testing.T) { }, }, } - extensionStages, err := manager.Hooks(&rspec.Spec{}, map[string]string{}, false) + extensionStageHooks, err := manager.Hooks(&rspec.Spec{}, map[string]string{}, false) if err == nil { t.Fatal("unexpected success") } assert.Regexp(t, "^hook \"a\\.json\": unknown stage \"does-not-exist\"$", err.Error()) - var nilExtensionStages map[string][]rspec.Hook - assert.Equal(t, nilExtensionStages, extensionStages) + var nilExtensionStageHooks map[string][]rspec.Hook + assert.Equal(t, nilExtensionStageHooks, extensionStageHooks) } func TestExtensionStage(t *testing.T) { @@ -197,7 +197,7 @@ func TestExtensionStage(t *testing.T) { } config := &rspec.Spec{} - extensionStages, err := manager.Hooks(config, map[string]string{}, false) + extensionStageHooks, err := manager.Hooks(config, map[string]string{}, false) if err != nil { t.Fatal(err) } @@ -226,7 +226,7 @@ func TestExtensionStage(t *testing.T) { Path: "/a/b/c", }, }, - }, extensionStages) + }, extensionStageHooks) } func init() { -- cgit v1.2.3-54-g00ecf