[ARVADOS] updated: efc17768290cc63cf7be7b2bccfc5caa77720846

[git at public.curoverse.com]

Summary of changes:
 services/api/test/unit/crunch_dispatch_test.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

       via  efc17768290cc63cf7be7b2bccfc5caa77720846 (commit)
      from  d88316705b23d1022ee2167c7ed0e5cf5e460cbe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit efc17768290cc63cf7be7b2bccfc5caa77720846
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Nov 27 04:28:16 2015 -0500

    Mock dispatch instead of relying on rollback in child proc.
    
    No issue #. amends d88316705b23d1022ee2167c7ed0e5cf5e460cbe

diff --git a/services/api/test/unit/crunch_dispatch_test.rb b/services/api/test/unit/crunch_dispatch_test.rb
index f01e50d..09f4af6 100644
--- a/services/api/test/unit/crunch_dispatch_test.rb
+++ b/services/api/test/unit/crunch_dispatch_test.rb
@@ -82,14 +82,9 @@ class CrunchDispatchTest < ActiveSupport::TestCase
           end
           ActiveRecord::Base.establish_connection
 
-          # Make sure the queue is empty. We don't really want to
-          # dispatch any jobs.
-          act_as_user users(:admin) do
-            Job.destroy_all
-            PipelineInstance.destroy_all
-          end
-
-          CrunchDispatch.new.run []
+          dispatch = CrunchDispatch.new
+          dispatch.stubs(:did_recently).returns true
+          dispatch.run []
         ensure
           Process.exit!
         end

-----------------------------------------------------------------------


hooks/post-receive
--