Ports are still broken, but I need to work on something else while I am thinking about how to fix them. Stupid /etc/services.

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

1 files changed, 21 insertions, 16 deletions

diff --git a/test/lib/puppettest/fileparsing.rb b/test/lib/puppettest/fileparsing.rb
index 9f8124df5..65c47e235 100644
--- a/test/lib/puppettest/fileparsing.rb
+++ b/test/lib/puppettest/fileparsing.rb
@@ -1,25 +1,30 @@
 module PuppetTest::FileParsing
     # Run an isomorphism test on our parsing process.
-    def fakedataparse(file)
-        oldtarget = @provider.default_target
-        cleanup do
-            @provider.default_target = oldtarget
-        end
-        @provider.default_target = file
+    def fakedataparse(*files)
+        files.each do |file|
+            oldtarget = @provider.default_target
+            cleanup do
+                @provider.default_target = oldtarget
+            end
+            @provider.default_target = file
 
-        assert_nothing_raised {
-            @provider.prefetch
-        }
+            assert_nothing_raised("failed to fetch %s" % file) {
+                @provider.prefetch
+            }
 
-        text = @provider.to_file(@provider.target_records(file))
+            text = nil
+            assert_nothing_raised("failed to generate %s" % file) do 
+                text = @provider.to_file(@provider.target_records(file))
+            end
 
-        yield if block_given?
+            yield if block_given?
 
-        oldlines = File.readlines(file)
-        newlines = text.chomp.split "\n"
-        oldlines.zip(newlines).each do |old, new|
-            assert_equal(old.chomp.gsub(/\s+/, ''), new.gsub(/\s+/, ''),
-                "Lines are not equal")
+            oldlines = File.readlines(file)
+            newlines = text.chomp.split "\n"
+            oldlines.zip(newlines).each do |old, new|
+                assert_equal(old.chomp.gsub(/\s+/, ''), new.gsub(/\s+/, ''),
+                    "Lines are not equal in %s" % file)
+            end
         end
     end
 end