kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

pkg/file{utils,notify}: don't compare to bool

Browse source 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
This commit is contained in:
unclejack 2017-03-30 12:12:17 +03:00
parent 087f7307a6
commit 20d6f5c2a9
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/filenotify/poller.go
View file

@ -44,7 +44,7 @@ func (w *filePoller) Add(name string) error {
w.mu.Lock() w.mu.Lock()
defer w.mu.Unlock() defer w.mu.Unlock()
if w.closed == true { if w.closed {
return errPollerClosed return errPollerClosed
} }
@ -78,7 +78,7 @@ func (w *filePoller) Remove(name string) error {
} }
func (w *filePoller) remove(name string) error { func (w *filePoller) remove(name string) error {
if w.closed == true { if w.closed {
return errPollerClosed return errPollerClosed
} }

18
pkg/fileutils/fileutils_test.go
View file

@ -208,7 +208,7 @@ func TestReadSymlinkedDirectoryToFile(t *testing.T) {
func TestWildcardMatches(t *testing.T) { func TestWildcardMatches(t *testing.T) {
match, _ := Matches("fileutils.go", []string{"*"}) match, _ := Matches("fileutils.go", []string{"*"})
if match != true { if !match {
t.Errorf("failed to get a wildcard match, got %v", match) t.Errorf("failed to get a wildcard match, got %v", match)
} }
} }
@ -216,7 +216,7 @@ func TestWildcardMatches(t *testing.T) {
// A simple pattern match should return true. // A simple pattern match should return true.
func TestPatternMatches(t *testing.T) { func TestPatternMatches(t *testing.T) {
match, _ := Matches("fileutils.go", []string{"*.go"}) match, _ := Matches("fileutils.go", []string{"*.go"})
if match != true { if !match {
t.Errorf("failed to get a match, got %v", match) t.Errorf("failed to get a match, got %v", match)
} }
} }
@ -224,7 +224,7 @@ func TestPatternMatches(t *testing.T) {
// An exclusion followed by an inclusion should return true. // An exclusion followed by an inclusion should return true.
func TestExclusionPatternMatchesPatternBefore(t *testing.T) { func TestExclusionPatternMatchesPatternBefore(t *testing.T) {
match, _ := Matches("fileutils.go", []string{"!fileutils.go", "*.go"}) match, _ := Matches("fileutils.go", []string{"!fileutils.go", "*.go"})
if match != true { if !match {
t.Errorf("failed to get true match on exclusion pattern, got %v", match) t.Errorf("failed to get true match on exclusion pattern, got %v", match)
} }
} }
@ -232,7 +232,7 @@ func TestExclusionPatternMatchesPatternBefore(t *testing.T) {
// A folder pattern followed by an exception should return false. // A folder pattern followed by an exception should return false.
func TestPatternMatchesFolderExclusions(t *testing.T) { func TestPatternMatchesFolderExclusions(t *testing.T) {
match, _ := Matches("docs/README.md", []string{"docs", "!docs/README.md"}) match, _ := Matches("docs/README.md", []string{"docs", "!docs/README.md"})
if match != false { if match {
t.Errorf("failed to get a false match on exclusion pattern, got %v", match) t.Errorf("failed to get a false match on exclusion pattern, got %v", match)
} }
} }
@ -240,7 +240,7 @@ func TestPatternMatchesFolderExclusions(t *testing.T) {
// A folder pattern followed by an exception should return false. // A folder pattern followed by an exception should return false.
func TestPatternMatchesFolderWithSlashExclusions(t *testing.T) { func TestPatternMatchesFolderWithSlashExclusions(t *testing.T) {
match, _ := Matches("docs/README.md", []string{"docs/", "!docs/README.md"}) match, _ := Matches("docs/README.md", []string{"docs/", "!docs/README.md"})
if match != false { if match {
t.Errorf("failed to get a false match on exclusion pattern, got %v", match) t.Errorf("failed to get a false match on exclusion pattern, got %v", match)
} }
} }
@ -248,7 +248,7 @@ func TestPatternMatchesFolderWithSlashExclusions(t *testing.T) {
// A folder pattern followed by an exception should return false. // A folder pattern followed by an exception should return false.
func TestPatternMatchesFolderWildcardExclusions(t *testing.T) { func TestPatternMatchesFolderWildcardExclusions(t *testing.T) {
match, _ := Matches("docs/README.md", []string{"docs/*", "!docs/README.md"}) match, _ := Matches("docs/README.md", []string{"docs/*", "!docs/README.md"})
if match != false { if match {
t.Errorf("failed to get a false match on exclusion pattern, got %v", match) t.Errorf("failed to get a false match on exclusion pattern, got %v", match)
} }
} }
@ -256,7 +256,7 @@ func TestPatternMatchesFolderWildcardExclusions(t *testing.T) {
// A pattern followed by an exclusion should return false. // A pattern followed by an exclusion should return false.
func TestExclusionPatternMatchesPatternAfter(t *testing.T) { func TestExclusionPatternMatchesPatternAfter(t *testing.T) {
match, _ := Matches("fileutils.go", []string{"*.go", "!fileutils.go"}) match, _ := Matches("fileutils.go", []string{"*.go", "!fileutils.go"})
if match != false { if match {
t.Errorf("failed to get false match on exclusion pattern, got %v", match) t.Errorf("failed to get false match on exclusion pattern, got %v", match)
} }
} }
@ -264,7 +264,7 @@ func TestExclusionPatternMatchesPatternAfter(t *testing.T) {
// A filename evaluating to . should return false. // A filename evaluating to . should return false.
func TestExclusionPatternMatchesWholeDirectory(t *testing.T) { func TestExclusionPatternMatchesWholeDirectory(t *testing.T) {
match, _ := Matches(".", []string{"*.go"}) match, _ := Matches(".", []string{"*.go"})
if match != false { if match {
t.Errorf("failed to get false match on ., got %v", match) t.Errorf("failed to get false match on ., got %v", match)
} }
} }
@ -573,7 +573,7 @@ func TestMatch(t *testing.T) {
pattern := tt.pattern pattern := tt.pattern
s := tt.s s := tt.s
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
if strings.Index(pattern, "\\") >= 0 { if strings.Contains(pattern, "\\") {
// no escape allowed on windows. // no escape allowed on windows.
continue continue
} }