Reworking test/lib structure a bit, and renaming all of the files so that their file names match their module names

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1631 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 0 insertions, 146 deletions

diff --git a/test/lib/support/utils.rb b/test/lib/support/utils.rb
deleted file mode 100644
index 9aea05aff..000000000
--- a/test/lib/support/utils.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-module PuppetTestSupport    
-    module Utils
-        def gcdebug(type)
-            Puppet.warning "%s: %s" % [type, ObjectSpace.each_object(type) { |o| }]
-        end
-
-        #
-        # TODO: I think this method needs to be renamed to something a little more explanatory.
-        #
-
-        def newobj(type, name, hash)
-            transport = Puppet::TransObject.new(name, "file")
-            transport[:path] = path
-            transport[:ensure] = "file"
-            assert_nothing_raised {
-                file = transport.to_type
-            }
-            end
-
-        # stop any services that might be hanging around
-        def stopservices
-            if stype = Puppet::Type.type(:service)
-                stype.each { |service|
-                    service[:ensure] = :stopped
-                    service.evaluate
-                }
-                    end
-        end
-
-        # TODO: rewrite this to use the 'etc' module.
-
-        def setme
-            # retrieve the user name
-            id = %x{id}.chomp
-            if id =~ /uid=\d+\(([^\)]+)\)/
-                @me = $1
-            else
-                puts id
-            end
-            unless defined? @me
-                raise "Could not retrieve user name; 'id' did not work"
-            end
-        end
-
-        def run_events(type, trans, events, msg)
-            case type
-            when :evaluate, :rollback: # things are hunky-dory
-            else
-                raise Puppet::DevError, "Incorrect run_events type"
-            end
-
-            method = type
-
-            newevents = nil
-            assert_nothing_raised("Transaction %s %s failed" % [type, msg]) {
-                newevents = trans.send(method).reject { |e| e.nil? }.collect { |e|
-                e.event
-            }
-            }
-
-            assert_equal(events, newevents, "Incorrect %s %s events" % [type, msg])
-
-            return trans
-        end
-
-        # If there are any fake data files, retrieve them
-        def fakedata(dir)
-            ary = [$puppetbase, "test"]
-            ary += dir.split("/")
-            dir = File.join(ary)
-
-            unless FileTest.exists?(dir)
-                raise Puppet::DevError, "No fakedata dir %s" % dir
-            end
-            files = Dir.entries(dir).reject { |f| f =~ /^\./ }.collect { |f|
-                File.join(dir, f)
-            }
-
-            return files
-        end
-
-        def fakefile(name)
-            ary = [$puppetbase, "test"]
-            ary += name.split("/")
-            file = File.join(ary)
-            unless FileTest.exists?(file)
-                raise Puppet::DevError, "No fakedata file %s" % file
-            end
-            return file
-        end
-
-        # wrap how to retrieve the masked mode
-        def filemode(file)
-            File.stat(file).mode & 007777
-        end
-
-        def memory
-            Puppet::Util.memory
-        end
-
-        # a list of files that we can parse for testing
-        def textfiles
-            textdir = File.join($puppetbase,"examples","code", "snippets")
-            Dir.entries(textdir).reject { |f|
-                f =~ /^\./ or f =~ /fail/
-            }.each { |f|
-                    yield File.join(textdir, f)
-                }
-        end
-
-        def failers
-            textdir = File.join($puppetbase,"examples","code", "failers")
-            # only parse this one file now
-            files = Dir.entries(textdir).reject { |file|
-                file =~ %r{\.swp}
-            }.reject { |file|
-                    file =~ %r{\.disabled}
-                }.collect { |file|
-                        File.join(textdir,file)
-                    }.find_all { |file|
-                        FileTest.file?(file)
-                    }.sort.each { |file|
-                        Puppet.debug "Processing %s" % file
-                        yield file
-                    }
-        end
-
-        def newcomp(*ary)
-            name = nil
-            if ary[0].is_a?(String)
-                name = ary.shift
-            else
-                name = ary[0].title
-            end
-
-            comp = Puppet.type(:component).create(
-                                                  :name => name
-                                                 )
-                                                 ary.each { |item|
-                                                     comp.push item
-                                                 }
-
-                                                 return comp
-        end
-    end
-end