Code smell: Avoid explicit returns

Replaced 583 occurances of

    (DEF)
        (LINES)
        return (.*)
    end

with

3 Examples:

    The code:
        def consolidate_failures(failed)
            filters = Hash.new { |h,k| h[k] = [] }
            failed.each do |spec, failed_trace|
                if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) }
                    filters[f] << spec
                    break
                end
            end
            return filters
        end
    becomes:
        def consolidate_failures(failed)
            filters = Hash.new { |h,k| h[k] = [] }
            failed.each do |spec, failed_trace|
                if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) }
                    filters[f] << spec
                    break
                end
            end
            filters
        end
    The code:
        def retrieve
            return_value = super
            return_value = return_value[0] if return_value && return_value.is_a?(Array)

            return return_value
        end
    becomes:
        def retrieve
            return_value = super
            return_value = return_value[0] if return_value && return_value.is_a?(Array)

            return_value
        end
    The code:
        def fake_fstab
            os = Facter['operatingsystem']
            if os == "Solaris"
                name = "solaris.fstab"
            elsif os == "FreeBSD"
                name = "freebsd.fstab"
            else
                # Catchall for other fstabs
                name = "linux.fstab"
            end
            oldpath = @provider_class.default_target
            return fakefile(File::join("data/types/mount", name))
        end
    becomes:
        def fake_fstab
            os = Facter['operatingsystem']
            if os == "Solaris"
                name = "solaris.fstab"
            elsif os == "FreeBSD"
                name = "freebsd.fstab"
            else
                # Catchall for other fstabs
                name = "linux.fstab"
            end
            oldpath = @provider_class.default_target
            fakefile(File::join("data/types/mount", name))
        end

3 files changed, 4 insertions, 4 deletions

diff --git a/test/network/authstore.rb b/test/network/authstore.rb
index 72c4ee584..9837a4686 100755
--- a/test/network/authstore.rb
+++ b/test/network/authstore.rb
@@ -15,7 +15,7 @@ class TestAuthStore < Test::Unit::TestCase
             store = Puppet::Network::AuthStore.new
         }
 
-        return store
+        store
     end
 
     def setup
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index 32951bcce..667adb853 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -19,7 +19,7 @@ class TestFileServer < Test::Unit::TestCase
             mount = Puppet::Network::Handler.fileserver::Mount.new(name, base)
         }
 
-        return mount
+        mount
     end
     # make a simple file source
     def mktestdir
@@ -36,7 +36,7 @@ class TestFileServer < Test::Unit::TestCase
             }
         }
 
-        return [testdir, %r{#{pattern}}, tmpfile]
+        [testdir, %r{#{pattern}}, tmpfile]
     end
 
     # make a bunch of random test files
diff --git a/test/network/xmlrpc/processor.rb b/test/network/xmlrpc/processor.rb
index 0b0646728..69f4c2fdc 100755
--- a/test/network/xmlrpc/processor.rb
+++ b/test/network/xmlrpc/processor.rb
@@ -51,7 +51,7 @@ class TestXMLRPCProcessor < Test::Unit::TestCase
 
         fakeparser = Class.new do
             def parseMethodCall(data)
-                return data
+                data
             end
         end