Remove dummy file watcher

internal/ingress/controller/nginx.go

@@ -163,10 +163,10 @@ Error loading new template: %v
 
 	n.t = ngxTpl
 
-	// TODO: refactor
 	if _, ok := fs.(filesystem.DefaultFs); !ok {
-		watch.NewDummyFileWatcher(tmplPath, onTemplateChange)
-	} else {
+		// do not setup watchers on tests
+		return n
+	}
 
 	_, err = watch.NewFileWatcher(tmplPath, onTemplateChange)
 	if err != nil {
@@ -174,7 +174,7 @@ Error loading new template: %v
 	}
 
 	filesToWatch := []string{}
-		err := filepath.Walk("/etc/nginx/geoip/", func(path string, info os.FileInfo, err error) error {
+	err = filepath.Walk("/etc/nginx/geoip/", func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -201,8 +201,6 @@ Error loading new template: %v
 		}
 	}
 
-	}
-
 	return n
 }
 

internal/watch/dummy.go

@@ -1,30 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package watch
-
-// DummyFileWatcher noop implementation of a file watcher
-type DummyFileWatcher struct{}
-
-// NewDummyFileWatcher creates a FileWatcher using the DummyFileWatcher
-func NewDummyFileWatcher(file string, onEvent func()) FileWatcher {
-	return DummyFileWatcher{}
-}
-
-// Close ends the watch
-func (f DummyFileWatcher) Close() error {
-	return nil
-}