Merge branch 'master' into av-update-ports

common/readfromfile.go

@@ -11,10 +11,9 @@ import (
 // A valid string will always be returned, regardless of whether an error occurred.
 func ReadFromFile(s string) (string, error) {
 	info, err := os.Stat(s)
-	if os.IsNotExist(err) {
-		// If the supplied string is not a path to a file,
-		// assume it is the pass and return it
-		return s, nil
+	// Return string as-is if the Stat call returned any error
+	if err != nil {
+		return s, err
 	}
 	if info.IsDir() {
 		// If the supplied string is a directory,

common/readfromfile_test.go

@@ -18,7 +18,7 @@ func TestReadFromFileNoFileExists(t *testing.T) {
 	// ReadFromFile should return the string it was supplied
 	output, err := ReadFromFile(input)
 
-	assert.Nil(err)
+	assert.NotNil(err)
 	// ReadFromFile should return the originally supplied string
 	assert.Equal(expectedOutput, output)
 }