polyphony 0.32 → 0.33

data/test/test_fiber.rb

@@ -168,6 +168,7 @@ class FiberTest < MiniTest::Test
     end
     assert_kind_of Hash, result
     assert_kind_of RuntimeError, result[:error]
+    assert_equal f, result[:error].source_fiber
   ensure
     f&.stop
   end
@@ -180,7 +181,7 @@ class FiberTest < MiniTest::Test
       2.times { snooze }
       result << 2
     end
-    spin { f.raise }
+    f2 = spin { f.raise }
     assert_equal 0, result.size
     begin
       f.await
@@ -190,6 +191,7 @@ class FiberTest < MiniTest::Test
     assert_equal 1, result.size
     assert_equal 1, result[0]
     assert_kind_of RuntimeError, error
+    assert_equal f, error.source_fiber
   ensure
     f&.stop
   end
@@ -250,7 +252,7 @@ class FiberTest < MiniTest::Test
       2.times { snooze }
       result << 2
     end
-    spin { f.raise 'foo' }
+    f2 = spin { f.raise 'foo' }
     assert_equal 0, result.size
     begin
       f.await
@@ -261,6 +263,7 @@ class FiberTest < MiniTest::Test
     assert_equal 1, result[0]
     assert_kind_of RuntimeError, error
     assert_equal 'foo', error.message
+    assert_equal f, error.source_fiber
   ensure
     f&.stop
   end
@@ -663,7 +666,6 @@ class FiberTest < MiniTest::Test
         o.close
       end
       snooze
-    ensure
     end
     o.close
     Gyro::Child.new(pid).await
@@ -827,6 +829,7 @@ class FiberControlTest < MiniTest::Test
     end
     assert_kind_of RuntimeError, error
     assert_equal 'foo', error.message
+    assert_equal f1, error.source_fiber
 
     assert_equal :dead, f1.state
     assert_equal :dead, f2.state
@@ -863,6 +866,7 @@ class FiberControlTest < MiniTest::Test
 
     assert_kind_of RuntimeError, result
     assert_equal 'foo', result.message
+    assert_equal f1, result.source_fiber
     assert_equal :dead, f1.state
     assert_equal :dead, f2.state
   end
@@ -874,4 +878,154 @@ class FiberControlTest < MiniTest::Test
     result = Fiber.select(f1, f2)
     assert_equal [f2, :baz], result
   end
-end
+end
+
+class SupervisionTest < MiniTest::Test
+  def test_exception_during_termination
+    f2 = nil
+    f = spin do
+      f2 = spin do
+        sleep
+      rescue Polyphony::Terminate
+        raise 'foo'
+      end
+      sleep
+    end
+
+    sleep 0.01
+    e = nil
+    begin
+      f.terminate
+      f.await
+    rescue => e
+    end
+
+    assert_kind_of RuntimeError, e
+    assert_equal 'foo', e.message
+    assert_equal f2, e.source_fiber
+  end
+end
+
+class RestartTest < MiniTest::Test
+  def test_restart
+    buffer = []
+    f = spin {
+      buffer << 1
+      receive
+      buffer << 2
+    }
+    snooze
+    assert_equal [1], buffer
+    f2 = f.restart
+    assert_equal f2, f
+    assert_equal [1], buffer
+    snooze
+    assert_equal [1, 1], buffer
+    
+    f << 'foo'
+    sleep 0.1
+    assert_equal [1, 1, 2], buffer
+  end
+
+  def test_restart_after_finalization
+    buffer = []
+    parent = spin {
+      sleep
+    }
+
+    f = parent.spin { |v|
+      buffer << Fiber.current
+      buffer << v
+      buffer << receive
+      buffer << :done
+    }
+    f.schedule('foo')
+    f << 'bar'
+    snooze
+    f.await
+
+    assert_equal [f, 'foo', 'bar', :done], buffer
+    assert_equal parent, f.parent
+
+    f2 = f.restart('baz')
+    assert f2 != f
+    assert_equal parent, f2.parent
+
+    f2 << 42
+    f2.await
+    assert_equal [f, 'foo', 'bar', :done, f2, 'baz', 42, :done], buffer
+  end
+end
+
+class SuperviseTest < MiniTest::Test
+  def test_supervise
+    p = spin { supervise }
+    snooze
+    f1 = p.spin { receive }
+    f2 = p.spin { receive }
+
+    snooze
+    assert_equal p.state, :waiting
+    f1 << 'foo'
+    f1.await
+    snooze
+
+    assert_equal :waiting, p.state
+    assert_equal :waiting, f2.state
+
+    f2 << 'bar'
+    f2.await
+    snooze
+
+    assert_equal :waiting, p.state
+  end
+
+  def test_supervise_with_restart
+    parent = spin { supervise(on_error: :restart) }
+    snooze
+
+    buffer = []
+    f1 = parent.spin do
+      buffer << 'f1'
+      buffer << receive
+    end
+
+    snooze
+    assert_equal ['f1'], buffer
+
+    f1.raise 'foo'
+
+    3.times { snooze }
+
+    assert_equal ['f1', 'f1'], buffer
+    assert_equal :dead, f1.state
+
+    # f1 should have been restarted by supervisor
+    f1 = parent.children.first
+    assert_kind_of Fiber, f1
+    f1 << 'foo'
+
+    f1.await
+    3.times { snooze }
+
+    assert_equal ['f1', 'f1', 'foo'], buffer
+  end
+
+  def test_supervise_with_block
+    failed = []
+    p = spin do
+      supervise(on_error: :restart) { |f, e| failed << [f, e] }
+    end
+    snooze
+    f1 = p.spin { receive }
+    snooze
+
+    f1.raise 'foo'
+    3.times { snooze }
+
+    assert_equal 1, failed.size
+    assert_equal f1, failed.first[0]
+    assert_kind_of RuntimeError, failed.first[1]
+    assert_equal 'foo', failed.first[1].message
+  end
+end

data/test/test_global_api.rb

@@ -40,6 +40,18 @@ class SpinTest < MiniTest::Test
     suspend
     assert_nil fiber.result
   end
+
+  def test_spin_without_tag
+    f = spin { }
+    assert_kind_of Fiber, f
+    assert_nil f.tag
+  end
+
+  def test_spin_with_tag
+    f = spin(:foo) { }
+    assert_kind_of Fiber, f
+    assert_equal :foo, f.tag
+  end
 end
 
 class ExceptionTest < MiniTest::Test
@@ -111,20 +123,6 @@ class MoveOnAfterTest < MiniTest::Test
   end
 end
 
-class SpinTest < MiniTest::Test
-  def test_spin_without_tag
-    f = spin { }
-    assert_kind_of Fiber, f
-    assert_nil f.tag
-  end
-
-  def test_spin_with_tag
-    f = spin(:foo) { }
-    assert_kind_of Fiber, f
-    assert_equal :foo, f.tag
-  end
-end
-
 class SpinLoopTest < MiniTest::Test
   def test_spin_loop
     buffer = []
@@ -195,6 +193,15 @@ class ThrottledLoopTest < MiniTest::Test
 end
 
 class GlobalAPIEtcTest < MiniTest::Test
+  def test_after
+    buffer = []
+    f = after(0.001) { buffer << 2 }
+    snooze
+    assert_equal [], buffer
+    sleep 0.001
+    assert_equal [2], buffer
+  end
+
   def test_every
     buffer = []
     f = spin do

data/test/test_kernel.rb

@@ -21,6 +21,29 @@ class KernelTest < MiniTest::Test
     timer&.stop
   end
 
+  def patch_open3
+    class << Open3
+      alias_method :orig_popen2, :popen2
+      def popen2(*args)
+        raise SystemCallError, 'foo'
+      end
+    end
+  end
+
+  def unpatch_open3
+    class << Open3
+      alias_method :popen2, :orig_popen2
+    end
+  end
+
+  def test_system_method_with_system_call_error
+    patch_open3
+    result = system('foo')
+    assert_nil result
+  ensure
+    unpatch_open3
+  end
+
   def test_backtick_method
     counter = 0
     timer = spin { throttled_loop(200) { counter += 1 } }

data/test/test_signal.rb

@@ -85,7 +85,7 @@ class SignalTrapTest < Minitest::Test
     ensure
       o.close
     end
-    sleep 0.01
+    sleep 0.02
     o.close
     watcher = Gyro::Child.new(pid)
     Process.kill('INT', pid)

data/test/test_thread.rb

@@ -50,7 +50,6 @@ class ThreadTest < MiniTest::Test
     buffer = []
     spin { (1..3).each { |i| snooze; buffer << i } }
     t = Thread.new { sleep 0.01; buffer << 4; :foo }
-
     r = t.await
 
     assert_equal [1, 2, 3, 4], buffer
@@ -92,16 +91,18 @@ class ThreadTest < MiniTest::Test
     lineno = __LINE__ + 1
     t = Thread.new { sleep 1 }
     str = format(
-      "#<Thread:%d %s:%d (run)>",
+      "#<Thread:%d %s:%d",
       t.object_id,
       __FILE__,
       lineno,
     )
-    assert_equal str, t.inspect
+    assert t.inspect =~ /#{str}/
   rescue => e
     p e
+    puts e.backtrace.join("\n")
   ensure
     t.kill
+    sleep 0.005
     t.join
   end
 

data/test/test_thread_pool.rb

@@ -65,10 +65,10 @@ class ThreadPoolTest < MiniTest::Test
     end
     elapsed = Time.now - t0
 
-    assert elapsed < 0.005
+    assert elapsed < 0.007
     assert buffer.size < 2
     
-    sleep 0.05
+    sleep 0.08 # allow time for threads to spawn
     assert_equal @pool.size, threads.uniq.size
     assert_equal (0..9).to_a, buffer.sort
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.32'
+  version: '0.33'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modulation
@@ -243,6 +243,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitbook.yaml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".vscode/launch.json"
@@ -402,6 +403,7 @@ files:
 - test/eg.rb
 - test/helper.rb
 - test/run.rb
+- test/stress.rb
 - test/test_async.rb
 - test/test_ext.rb
 - test/test_fiber.rb
@@ -415,7 +417,7 @@ files:
 - test/test_throttler.rb
 - test/test_timer.rb
 - test/test_trace.rb
-homepage: https://dfab.gitbook.io/polyphony/
+homepage: https://digital-fabric.github.io/polyphony
 licenses:
 - MIT
 metadata:
@@ -445,5 +447,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: 'Polyphony: Fiber-based Concurrency for Ruby'
+summary: Fine grained concurrency for Ruby
 test_files: []