Merge pull request #62 from essentialkaos/develop

Version 3.2.1
essentialkaos · Aug 1, 2016 · ac532c9 · ac532c9
2 parents 48912fb + 605f0b8
commit ac532c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 ## Changelog
 
+#### v3.2.1
+
+* `[knf]` Fixed typo in tests
+* `[strutil]` Removed unreachable code
+
 #### v3.2.0
 
 * `[strutil]` Added method `Len` which return number of symbols in string

diff --git a/knf/knf_test.go b/knf/knf_test.go
@@ -82,7 +82,7 @@ const _CONFIG_MALF_DATA = `
 
 const (
 	_CONFIG_FILE_NAME           = "knf-config-test.conf"
-	_CONFIG_EMTPY_FILE_NAME     = "knf-config-test-empty.conf"
+	_CONFIG_EMPTY_FILE_NAME     = "knf-config-test-empty.conf"
 	_CONFIG_MALFORMED_FILE_NAME = "knf-config-test-malf.conf"
 )
 
@@ -108,7 +108,7 @@ func (s *KNFSuite) SetUpSuite(c *check.C) {
 	tmpdir := c.MkDir()
 
 	s.ConfigPath = tmpdir + "/" + _CONFIG_FILE_NAME
-	s.EmptyConfigPath = tmpdir + "/" + _CONFIG_EMTPY_FILE_NAME
+	s.EmptyConfigPath = tmpdir + "/" + _CONFIG_EMPTY_FILE_NAME
 	s.MalformedConfigPath = tmpdir + "/" + _CONFIG_MALFORMED_FILE_NAME
 
 	err := ioutil.WriteFile(s.ConfigPath, []byte(_CONFIG_DATA), 0644)

diff --git a/strutil/strutil.go b/strutil/strutil.go
@@ -108,7 +108,6 @@ func Tail(s string, n int) string {
 		return s
 	}
 
-	return s[l-n:]
 	return Substr(s, l-n, 99999999999)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,7 +108,6 @@ func Tail(s string, n int) string { @@
     		return s
     	}
-    	return s[l-n:]
     	return Substr(s, l-n, 99999999999)
     }
@@ Expand Down @@