Intermediate commit; ports are not working yet

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

4 files changed, 40 insertions, 81 deletions

diff --git a/test/providers/parsedhost.rb b/test/providers/parsedhost.rb
index 1d982c813..bb122129a 100644
--- a/test/providers/parsedhost.rb
+++ b/test/providers/parsedhost.rb
@@ -194,28 +194,7 @@ class TestParsedHostProvider < Test::Unit::TestCase
 
     # Parse our sample data and make sure we regenerate it correctly.
     def test_hostsparse
-        fakedata("data/types/hosts").each { |file|
-            @provider.path = file
-            instances = nil
-            assert_nothing_raised {
-                instances = @provider.retrieve
-            }
-
-            text = @provider.fileobj.read
-
-            dest = tempfile()
-            @provider.path = dest
-
-            # Now write it back out
-            assert_nothing_raised {
-                @provider.store(instances)
-            }
-
-            newtext = @provider.fileobj.read
-
-            # Don't worry about difference in whitespace
-            assert_equal(text.gsub(/\s+/, ' '), newtext.gsub(/\s+/, ' '))
-        }
+        fakedata("data/types/hosts").each do |file| fakedataparse(file) end
     end
 
     # Make sure we can modify the file elsewhere and those modifications will
diff --git a/test/providers/parsedsshkey.rb b/test/providers/parsedsshkey.rb
index f0295c47a..7f21a58b4 100755
--- a/test/providers/parsedsshkey.rb
+++ b/test/providers/parsedsshkey.rb
@@ -30,26 +30,7 @@ class TestParsedSSHKey < Test::Unit::TestCase
 
     def test_keysparse
         fakedata("data/types/sshkey").each { |file|
-            @provider.path = file
-            instances = nil
-            assert_nothing_raised {
-                instances = @provider.retrieve
-            }
-
-            text = @provider.fileobj.read
-
-            dest = tempfile()
-            @provider.path = dest
-
-            # Now write it back out
-            assert_nothing_raised {
-                @provider.store(instances)
-            }
-
-            newtext = @provider.fileobj.read
-
-            # Don't worry about difference in whitespace
-            assert_equal(text.gsub(/\s+/, ' '), newtext.gsub(/\s+/, ' '))
+            fakedataparse(file)
         }
     end
 end
diff --git a/test/puppettest.rb b/test/puppettest.rb
index 21b539288..5056f2d40 100644
--- a/test/puppettest.rb
+++ b/test/puppettest.rb
@@ -440,6 +440,30 @@ module TestPuppet
         return file
     end
 
+    # Run an isomorphism test on our parsing process.
+    def fakedataparse(file)
+        @provider.path = file
+        instances = nil
+        assert_nothing_raised {
+            instances = @provider.retrieve
+        }
+
+        text = @provider.fileobj.read
+
+        dest = tempfile()
+        @provider.path = dest
+
+        # Now write it back out
+        assert_nothing_raised {
+            @provider.store(instances)
+        }
+
+        newtext = @provider.fileobj.read
+
+        # Don't worry about difference in whitespace
+        assert_equal(text.gsub(/\s+/, ' '), newtext.gsub(/\s+/, ' '))
+    end
+
     # wrap how to retrieve the masked mode
     def filemode(file)
         File.stat(file).mode & 007777
diff --git a/test/types/port.rb b/test/types/port.rb
index debd7ed89..e550bd83e 100755
--- a/test/types/port.rb
+++ b/test/types/port.rb
@@ -14,23 +14,25 @@ require 'facter'
 
 class TestPort < Test::Unit::TestCase
 	include TestPuppet
+
     def setup
         super
         @porttype = Puppet.type(:port)
-        @oldfiletype = @porttype.filetype
-    end
 
-    def teardown
-        @porttype.filetype = @oldfiletype
-        Puppet.type(:file).clear
-        super
-    end
+        @provider = @porttype.defaultprovider
 
-    # Here we just create a fake host type that answers to all of the methods
-    # but does not modify our actual system.
-    def mkfaketype
-        pfile = tempfile()
-        @porttype.path = pfile
+        # Make sure they aren't using something funky like netinfo
+        unless @provider.name == :parsed
+            @porttype.defaultprovider = @porttype.provider(:parsed)
+        end
+
+        cleanup do @porttype.defaultprovider = nil end
+
+        oldpath = @provider.path
+        cleanup do
+            @provider.path = oldpath
+        end
+        @provider.path = tempfile()
     end
 
     def mkport
@@ -55,7 +57,6 @@ class TestPort < Test::Unit::TestCase
     end
 
     def test_simpleport
-        mkfaketype
         host = nil
         assert_nothing_raised {
             assert_nil(Puppet.type(:port).retrieve)
@@ -77,29 +78,7 @@ class TestPort < Test::Unit::TestCase
         }
     end
 
-    def test_portsparse
-        fakedata("data/types/ports").each { |file|
-            @porttype.path = file
-            Puppet.info "Parsing %s" % file
-            assert_nothing_raised {
-                @porttype.retrieve
-            }
-
-            # Now just make we've got some ports we know will be there
-            dns = @porttype["domain"]
-            assert(dns, "Could not retrieve DNS port")
-
-            assert_equal("53", dns.is(:number), "DNS number was wrong")
-            %w{udp tcp}.each { |v|
-                assert(dns.is(:protocols).include?(v), "DNS did not include proto %s" % v)
-            }
-
-            @porttype.clear
-        }
-    end
-
     def test_moddingport
-        mkfaketype
         port = nil
         port = mkport
 
@@ -123,7 +102,6 @@ class TestPort < Test::Unit::TestCase
     end
 
     def test_removal
-        mkfaketype
         port = mkport()
         assert_nothing_raised {
             port[:ensure] = :present
@@ -142,7 +120,6 @@ class TestPort < Test::Unit::TestCase
     end
 
     def test_modifyingfile
-        mkfaketype()
 
         ports = []
         names = []
@@ -174,8 +151,6 @@ class TestPort < Test::Unit::TestCase
     end
 
     def test_addingstates
-        mkfaketype
-
         port = mkport()
         assert_events([:port_created], port)