Skip to content

Commit

Permalink
Fixed bug: Task raises previous exception on second invokation after …
Browse files Browse the repository at this point in the history
…beeing reenable-d.
  • Loading branch information
thorsteneckel committed Aug 20, 2018
1 parent 124a03b commit 714a180
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/rake/task.rb
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ def arg_names
# Reenable the task, allowing its tasks to be executed if the task
# is invoked again.
def reenable
@already_invoked = false
@already_invoked = false
@invocation_exception = nil
end

# Clear the existing prerequisites, actions, comments, and arguments of a rake task.
Expand Down
27 changes: 27 additions & 0 deletions test/test_rake_task.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,33 @@ def test_can_double_invoke_with_reenable
assert_equal ["t1", "t1"], runlist
end

def test_can_triple_invoke_after_exception_with_reenable
raise_exception = true
invoked = 0

t1 = task(:t1) do |t|
invoked += 1
next if !raise_exception

raise_exception = false
raise 'Some error'
end

assert_raises(RuntimeError) { t1.invoke }
assert_equal 1, invoked

t1.reenable

# actually invoke second time
t1.invoke
assert_equal 2, invoked

# recognize already invoked and
# don't raise pre-reenable exception
t1.invoke
assert_equal 2, invoked
end

def test_clear
desc "a task"
t = task("t", ["b"] => "a") {}
Expand Down

0 comments on commit 714a180

Please sign in to comment.