purge to purge! and added engine#purge! (teardown)

TODO.txt

@@ -240,3 +240,5 @@ restart tests :
 
 [ ] implement kill_process! (kill_expression! ?)
 
+[ ] engine.force_reply_to_parent(fei) ?
+

lib/ruote/engine/engine.rb

@@ -240,6 +240,20 @@ def shutdown
       end
     end
 
+    # Cleans the engine and its services. Used by the test framework.
+    #
+    def purge!
+
+      wqueue.purge!
+        # at first, try to make work stop
+
+      @context.values.each do |service|
+        next if service == self
+        next if service.is_a?(Ruote::Workqueue)
+        service.purge! if service.respond_to?(:purge!)
+      end
+    end
+
     def add_service (key, o)
 
       remove_service(key)

lib/ruote/evt/fs_tracker.rb

@@ -49,6 +49,13 @@ def shutdown
       @bucket.close
     end
 
+    # Clears this tracker. Mostly used by the test framework.
+    #
+    def purge!
+
+      @bucket.save(Set.new)
+    end
+
     protected
 
     def listeners

lib/ruote/evt/tracker.rb

@@ -61,6 +61,13 @@ def unregister (fei)
       save(listeners.delete(fei))
     end
 
+    # Clears this tracker. Mostly used by the test framework.
+    #
+    def purge!
+
+      @listeners = Set.new
+    end
+
     protected
 
     def listeners

lib/ruote/queue/thread_workqueue.rb

@@ -60,6 +60,13 @@ def shutdown
 
       while @queue.size > 0; Thread.pass; end
     end
+
+    # Basically, it returns when there are no more jobs... It's like #shutdown.
+    #
+    def purge!
+
+      shutdown
+    end
   end
 end
 

lib/ruote/storage/cache_storage.rb

@@ -114,10 +114,12 @@ def to_s
       r << real_storage.to_s
     end
 
-    def purge
+    # Clears this storage. Mostly used by the test framework.
+    #
+    def purge!
 
       @cache.clear
-      real_storage.purge if real_storage.respond_to?(:purge)
+      real_storage.purge! if real_storage.respond_to?(:purge!)
     end
 
     protected

lib/ruote/storage/fs_storage.rb

@@ -139,11 +139,18 @@ def discard_all_tickets (fei)
       # nothing to do
     end
 
+    # Clears this storage. Mostly used by the test framework.
+    #
+    def purge!
+
+      Dir[File.join(@path, '*')].each { |d| FileUtils.rm_rf(d) }
+    end
+
     protected
 
     def all_filenames
 
-      Dir["#{@path}/**/*.ruote"]
+      Dir[File.join(@path, '**', '*.ruote')]
     end
 
     def dir_for (wfid)

lib/ruote/storage/hash_storage.rb

@@ -64,6 +64,13 @@ def [] (fei)
 
       exp
     end
+
+    # Clears this storage. Mostly used by the test framework.
+    #
+    def purge!
+
+      clear
+    end
   end
 end
 

lib/ruote/time/fs_scheduler.rb

@@ -88,6 +88,11 @@ def to_h
       operate { |jobs| jobs.inject({}) { |h, j| h[j.job_id] = j; h } }
     end
 
+    def purge!
+
+      operate { |jobs| jobs.clear }
+    end
+
     protected
 
     def operate (skip=false, &block)
@@ -167,6 +172,14 @@ def shutdown
       @jq.shutdown
       @cjq.shutdown
     end
+
+    # Clears all jobs. Mostly used by the test framework.
+    #
+    def purge!
+
+      @jq.purge!
+      @cjq.purge!
+    end
   end
 end
 

lib/ruote/time/scheduler.rb

@@ -133,6 +133,13 @@ def jobs
       @scheduler.jobs
     end
 
+    # Clears all jobs. Mostly used by the test framework.
+    #
+    def purge!
+
+      @scheduler.all_jobs { |j| @scheduler.unschedule(j.job_id) }
+    end
+
     protected
 
     def reload

test/functional/base.rb

@@ -37,9 +37,8 @@ def setup
 
   def teardown
 
-    @engine.shutdown
-
     purge_engine
+    @engine.shutdown
   end
 
   def assert_log_count (count, &block)
@@ -180,9 +179,8 @@ def assert_no_remaining_expressions (wfid, opts)
 
   def purge_engine
 
-    @engine.context.values.each do |s|
-      s.purge if s.respond_to?(:purge)
-    end
+    @engine.purge!
+
     FileUtils.rm_rf('work')
   end
 

test/functional/eft_18_concurrent_iterator.rb

@@ -332,7 +332,7 @@ def test_cancel
 
     wfid = @engine.launch(pdef)
 
-    sleep n.to_f/80
+    sleep n.to_f/50
 
     assert_equal n, acount
 

test/functional/ft_32_history.rb

@@ -30,6 +30,8 @@ def test_launch
     wfid0 = assert_trace(pdef, "done.")
     wfid1 = assert_trace(pdef, "done.\ndone.")
 
+    sleep 0.010
+
     lines = File.readlines(Dir['work/log/*'].first)
 
     assert_equal 8, lines.size
@@ -93,6 +95,8 @@ def test_errors
     wfid = @engine.launch(pdef)
     wait_for(wfid)
 
+    sleep 0.010
+
     #dump_history
 
     h = @engine.history.process_history(wfid)