Merging of refactor-transacton to the trunk. This work removes the :is attribute from properties and relies on the provider to cache or return the current value of the property.

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

6 files changed, 39 insertions, 31 deletions

diff --git a/test/ral/providers/package/apt.rb b/test/ral/providers/package/apt.rb
index d289bdd3c..97998e4bb 100755
--- a/test/ral/providers/package/apt.rb
+++ b/test/ral/providers/package/apt.rb
@@ -28,7 +28,7 @@ class AptPackageProviderTest < PuppetTest::TestCase
 							  'faff'
 					  ).returns(
 					        "deinstall ok config-files faff 1.2.3-1\n"
-					  )
+					  ).times(2)
 
 		pkg.provider.expects(
 		                 :aptget
@@ -56,7 +56,7 @@ class AptPackageProviderTest < PuppetTest::TestCase
 					        'faff'
 					  ).returns(
 					        "install ok installed faff 1.2.3-1\n"
-					  )
+					  ).times(2)
 		pkg.provider.expects(
 		                 :aptget
 					  ).with(
diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb
index a8ab6f7b7..891603f64 100755
--- a/test/ral/providers/package/aptitude.rb
+++ b/test/ral/providers/package/aptitude.rb
@@ -19,16 +19,16 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
 		                   :ensure => :present,
 		                   :source => "/tmp/faff.deb"
 
-		pkg.provider.expects(
-		                 :dpkgquery
-					  ).with(
-							  '-W',
-							  '--showformat',
-							  '${Status} ${Package} ${Version}\n',
-							  'faff'
-					  ).returns(
-					        "deinstall ok config-files faff 1.2.3-1\n"
-					  )
+ 		pkg.provider.expects(
+ 		                 :dpkgquery
+ 					  ).with(
+ 							  '-W',
+ 							  '--showformat',
+ 							  '${Status} ${Package} ${Version}\n',
+ 							  'faff'
+ 					  ).returns(
+ 					        "deinstall ok config-files faff 1.2.3-1\n"
+ 					  ).times(2)
 
 		pkg.provider.expects(
 		                 :aptitude
@@ -40,7 +40,10 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
 		                 'faff'
 					  ).returns(0)
 		
-		pkg.evaluate.each { |state| state.transaction = self; state.forward }
+		pkg.evaluate.each { |state| 
+                    state.transaction = self 
+                    state.forward 
+          }
 	end
 	
 	def test_purge
@@ -55,7 +58,7 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
 					        'faff'
 					  ).returns(
 					        "install ok installed faff 1.2.3-1\n"
-					  )
+					  ).times(2)
 		pkg.provider.expects(
 		                 :aptitude
 					  ).with(
diff --git a/test/ral/providers/package/aptrpm.rb b/test/ral/providers/package/aptrpm.rb
index 488862683..0388135df 100755
--- a/test/ral/providers/package/aptrpm.rb
+++ b/test/ral/providers/package/aptrpm.rb
@@ -28,7 +28,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
                             '--nodigest',
                             '--qf',
                             "%{NAME}-%{VERSION}-%{RELEASE} %{VERSION}-%{RELEASE}\n"
-                      ).raises(Puppet::ExecutionFailure, "couldn't find rpm")
+                      ).raises(Puppet::ExecutionFailure, "couldn't find rpm").times(2)
 
         pkg.provider.expects(
                          :aptget
@@ -56,7 +56,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
                         "%{NAME}-%{VERSION}-%{RELEASE} %{VERSION}-%{RELEASE}\n"
                     ).returns(
                         "faff-1.2.3-1 1.2.3-1\n"
-                    )
+                    ).times(2)
         pkg.provider.expects(
                         :aptget
                     ).with(
diff --git a/test/ral/providers/package/dpkg.rb b/test/ral/providers/package/dpkg.rb
index 3d26150d8..69b6a3c10 100755
--- a/test/ral/providers/package/dpkg.rb
+++ b/test/ral/providers/package/dpkg.rb
@@ -27,7 +27,7 @@ class DpkgPackageProviderTest < PuppetTest::TestCase
 							  'faff'
 					  ).returns(
 					        "deinstall ok config-files faff 1.2.3-1\n"
-					  )
+					  ).times(2)
 
 		pkg.provider.expects(
 		                 :dpkg
@@ -51,7 +51,7 @@ class DpkgPackageProviderTest < PuppetTest::TestCase
 					        'faff'
 					  ).returns(
 					        "install ok installed faff 1.2.3-1\n"
-					  )
+					  ).times(2)
 		pkg.provider.expects(
 		                 :dpkg
 					  ).with(
diff --git a/test/ral/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb
index cfc966a6c..015d0a8b7 100755
--- a/test/ral/providers/parsedfile.rb
+++ b/test/ral/providers/parsedfile.rb
@@ -301,14 +301,14 @@ class TestParsedFile < Test::Unit::TestCase
 
         # Lastly, create a model with separate is and should values
         mtarget = tempfile()
-        istarget = tempfile()
+        # istarget = tempfile()
         files[:models] = mtarget
-        files[:ismodels] = istarget
+        # files[:ismodels] = istarget
         model = mkmodel "yay", :target => mtarget
-        model.is = [:target, istarget]
+        # model.is = [:target, istarget]
 
         assert(model.should(:target), "Did not get a value for target")
-        assert(model.is(:target), "Did not get a value for target")
+        # assert(model.is(:target), "Did not get a value for target")
 
         list = nil
         assert_nothing_raised do
@@ -559,12 +559,20 @@ class TestParsedFile < Test::Unit::TestCase
 
         # First make sure we can retrieve values multiple times from the
         # provider
-        assert(bill.is(:one), "Bill does not have a value for 'one'")
-        assert(bill.is(:one), "Bill does not have a value for 'one' on second try")
+        bills_values = nil
+        assert_nothing_raised do
+            bills_values = bill.retrieve
+        end
+
+        assert(bills_values[bill.property(:one)], 
+               "Bill does not have a value for 'one'")
+        assert(bills_values[bill.property(:one)], 
+               "Bill does not have a value for 'one' on second try")
         assert_nothing_raised do
             bill.retrieve
         end
-        assert(bill.is(:one), "bill's value for 'one' disappeared")
+        assert(bills_values[bill.property(:one)], 
+               "bill's value for 'one' disappeared")
     end
 
     # Make sure that creating a new model finds existing records in memory
@@ -603,11 +611,12 @@ class TestParsedFile < Test::Unit::TestCase
         assert_apply(bill)
 
         prov.prefetch
+        current_value = nil
         assert_nothing_raised do
-            bill.retrieve
+            current_value = bill.retrieve
         end
 
-        assert(bill.insync?,
+        assert(bill.insync?(current_value),
             "An invalid field marked the record out of sync")
     end
 
diff --git a/test/ral/providers/user/useradd.rb b/test/ral/providers/user/useradd.rb
index ca917f6c4..55bb96f2a 100755
--- a/test/ral/providers/user/useradd.rb
+++ b/test/ral/providers/user/useradd.rb
@@ -29,7 +29,6 @@ class UserAddProviderTest < PuppetTest::TestCase
 
         @vals.each do |name, val|
             next unless @user.class.validproperty?(name)
-            @user.is = [name, :absent]
         end
         @user
     end
@@ -46,7 +45,6 @@ class UserAddProviderTest < PuppetTest::TestCase
 
         @vals.each do |name, val|
             next unless user.class.validproperty?(name)
-            user.is = [name, :absent]
         end
 
         user.expects(:allowdupe?).returns(false)
@@ -204,8 +202,6 @@ class UserAddProviderTest < PuppetTest::TestCase
 
         # Now mark the user made, and make sure the right command is called
         setup_user
-        @user.is = [:ensure, :present]
-        @user.is = [:password, :present]
         @vals[:password] = "somethingelse"
 
 		@user.provider.expects(:execute).with do |params|