[api] really test delayed jobs

openSUSE · Sep 7, 2013 · c37b728 · c37b728
1 parent 8ad6479
commit c37b728
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -94,7 +94,7 @@ GEM
     rdoc (4.0.1)
       json (~> 1.4)
     riddle (1.5.8)
-    ruby-ldap (0.9.13)
+    ruby-ldap (0.9.16)
     ruby_parser (3.2.2)
       sexp_processor (~> 4.1)
     safe_yaml (0.9.5)

diff --git a/src/api/test/functional/issue_controller_test.rb b/src/api/test/functional/issue_controller_test.rb
@@ -3,6 +3,16 @@
 class IssueControllerTest < ActionDispatch::IntegrationTest
   fixtures :all
 
+  def setup
+    stub_request(:post, "http://bugzilla.novell.com/xmlrpc.cgi").to_timeout
+    super
+  end
+
+  def teardown
+    WebMock.reset!
+    super
+  end
+
   def test_get_issues
     # bugs are public atm. Secret stuff should not get imported.
     get '/issue_trackers'

diff --git a/src/api/test/functional/maintenance_test.rb b/src/api/test/functional/maintenance_test.rb
@@ -7,9 +7,11 @@ class MaintenanceTests < ActionDispatch::IntegrationTest
   def setup
     super
     wait_for_scheduler_start
+    stub_request(:post, "http://bugzilla.novell.com/xmlrpc.cgi").to_timeout
   end
 
   teardown do
+    WebMock.reset!
     Timecop.return
   end
 

diff --git a/src/api/test/functional/release_management_test.rb b/src/api/test/functional/release_management_test.rb
@@ -7,11 +7,15 @@ class ReleaseManagementTests < ActionDispatch::IntegrationTest
   def test_release_project
     prepare_request_with_user "tom", "thunder"
 
-    # inject a job for copy any entire project ... gets not executed in test suite
+    # inject a job for copy any entire project ... gets copied in testsuite but appears to be delayed
     post "/source/home:tom:BaseDistro", :cmd => :copy, :oproject => "BaseDistro"
     assert_response :success
     assert_xml_tag( :tag => "status", :attributes => { :code => "invoked"} )
 
+    # cleanup
+    delete "/source/home:tom:BaseDistro"
+    assert_response :success
+
     # copy any entire project NOW
     post "/source/home:tom:BaseDistro", :cmd => :copy, :oproject => "BaseDistro", :nodelay => 1
     assert_response :success

diff --git a/src/api/test/models/event_test.rb b/src/api/test/models/event_test.rb
@@ -7,7 +7,6 @@ class EventTest < ActiveSupport::TestCase
 
   teardown do
     WebMock.reset!
-    Delayed::Worker.delay_jobs = true
   end
 
   test "find nothing" do
@@ -36,7 +35,6 @@ class EventTest < ActiveSupport::TestCase
   end
 
   test "sent all" do
-    Delayed::Worker.delay_jobs = false
     Event::NotifyBackends.trigger_delayed_sent
   end
 

diff --git a/src/api/test/unit/issue_test.rb b/src/api/test/unit/issue_test.rb
@@ -3,7 +3,7 @@
 class IssueTest < ActiveSupport::TestCase
   fixtures :all
 
-  def teardown
+  teardown do
     WebMock.reset!
   end
 

diff --git a/src/api/test/unit/package_test.rb b/src/api/test/unit/package_test.rb
@@ -5,11 +5,13 @@ class PackageTest < ActiveSupport::TestCase
   fixtures :all
 
   def setup
+    super
     @package = Package.find( 10095 )
   end
 
   def teardown
     Timecop.return
+    super
   end
 
   def test_flags_to_axml