dynflow 0.8.32 → 0.8.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b538623ca2c12b55a2f3937293d72bc00ae2dff
-  data.tar.gz: efa72daede2802ffab30178cb01034ff224eea94
+  metadata.gz: 331deb991c6fe8d4617af49ce8072fe0edceef6f
+  data.tar.gz: 8de8181ec0b0451fefab469ee496172b8f1938dc
 SHA512:
-  metadata.gz: f422a9edaf501a2157ddf7adaff12416226037baa08a7245317980e0701fb36506401087af65f370037ec4b5e7f105fd8b97f2417bd4cea57a1e66c2624af98a
-  data.tar.gz: 3988359a776fdc9d34960779d12a8c9f8a2a67af599a39f13998dfdb05a64ed36972d80ba10a4f59996bb519d0ac7874f172fbf359ff5468fa7079adf1b802ae
+  metadata.gz: 90d6626cc3af5a24784985ac6efd3beb029a50524b899f3ba9028248ddd0952cab7d72f46284cb1595a2d8ec74512a4d0247a77e41011306ec5a237d51c18e43
+  data.tar.gz: 5db089dc8165ea98ad5677e8a4849e369c6329b856023084cdd6cc4b9ef4427a6bd39a59e8921be689ba3b03b7427138647b636ec02c386ff03610d2d5009631

data/lib/dynflow/testing/in_thread_executor.rb

@@ -34,7 +34,7 @@ module Dynflow
       end
 
       def clock_tick
-        @world.clock.progress
+        @world.clock.progress_all([:periodic_check_inbox])
       end
 
       def feed_queue(work_items)

data/lib/dynflow/testing/managed_clock.rb

@@ -17,15 +17,21 @@ module Dynflow
         @pending_pings.sort!
       end
 
-      def progress
+      def progress(ignored_subjects = [])
         if next_ping = @pending_pings.shift
-          # we are testing an isolated system = we can move in time
-          # without actually waiting
-          @current_time = next_ping.when
-          next_ping.apply
+          if !next_ping.what.respond_to?(:value) || !ignored_subjects.include?(next_ping.what.value)
+            # we are testing an isolated system = we can move in time
+            # without actually waiting
+            @current_time = next_ping.when
+            next_ping.apply
+          end
         end
       end
 
+      def progress_all(ignored_subjects = [])
+        progress(ignored_subjects) until @pending_pings.empty?
+      end
+
       def current_time
         @current_time ||= Time.now
       end

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.8.32'
+  VERSION = '0.8.33'
 end

data/test/testing_test.rb

@@ -166,6 +166,41 @@ module Dynflow
       end
     end
 
+    describe 'in thread executor with unrelated events in clock' do
+      class PollingAction < ::Dynflow::Action
+        def run(event = nil)
+          if output[:suspended].nil?
+            output[:suspended] = true
+            suspend do |action|
+              world.clock.ping(action, 1000, nil)
+            end
+          end
+        end
+      end
+
+      let :world do
+        WorldFactory.create_world(Dynflow::Testing::InThreadWorld)
+      end
+
+      let :execution_plan do
+        world.plan(PollingAction)
+      end
+
+      it 'processes unrelated events' do
+        q = Queue.new
+        20.times { |i| world.clock.ping q, 0.0002, :periodic_check_inbox }
+
+        f = world.execute(execution_plan.id)
+
+        # This deadlocks the test
+        f.wait
+
+        f.value.tap do |plan|
+          plan.state.must_equal :stopped
+        end
+      end
+    end
+
     describe "in thread executor" do
       let :world do
         WorldFactory.create_world(Dynflow::Testing::InThreadWorld)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.32
+  version: 0.8.33
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json