fixing verbose output to be better and easier to manage

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

1 files changed, 34 insertions, 16 deletions

diff --git a/test/other/tc_transactions.rb b/test/other/tc_transactions.rb
index 3383b3b34..fc849c04b 100644
--- a/test/other/tc_transactions.rb
+++ b/test/other/tc_transactions.rb
@@ -193,20 +193,29 @@ class TestTransactions < Test::Unit::TestCase
         }
 
         # this should cause a restart of the service
+        events = nil
         assert_nothing_raised() {
-            transaction.evaluate
+            events = transaction.evaluate
         }
 
-        fakevent = Puppet::Event.new(
-            :event => :ALL_EVENTS,
-            :object => self,
-            :transaction => transaction,
-            :message => "yay"
-        )
+        event = events.pop
+
+        assert(event)
+
+        #fakevent = nil
+        #assert_nothing_raised {
+        #    fakevent = Puppet::Event.new(
+        #        :event => :ALL_EVENTS,
+        #        :object => file,
+        #        :state => file.state(:mode),
+        #        :transaction => transaction,
+        #        :message => "yay"
+        #    )
+        #}
 
         sub = nil
         assert_nothing_raised() {
-            sub = file.subscribers?(fakevent)
+            sub = file.subscribers?(event)
         }
 
         assert(sub)
@@ -256,20 +265,29 @@ class TestTransactions < Test::Unit::TestCase
         }
 
         # this should cause a restart of the service
+        events = nil
         assert_nothing_raised() {
-            transaction.evaluate
+            events = transaction.evaluate
         }
 
-        fakevent = Puppet::Event.new(
-            :event => :ALL_EVENTS,
-            :object => self,
-            :transaction => transaction,
-            :message => "yay"
-        )
+        event = events.pop
+
+        assert(event)
+
+        #fakevent = nil
+        #assert_nothing_raised {
+        #    fakevent = Puppet::Event.new(
+        #        :event => :ALL_EVENTS,
+        #        :object => file,
+        #        :state => file.state(:mode),
+        #        :transaction => transaction,
+        #        :message => "yay"
+        #    )
+        #}
 
         sub = nil
         assert_nothing_raised() {
-            sub = fcomp.subscribers?(fakevent)
+            sub = file.subscribers?(event)
         }
 
         assert(sub)