Bug 967504 - tests

console/app/models/rest_api/base.rb

@@ -867,7 +867,7 @@ def http
   class Base
     self.idle_timeout = 4
     self.open_timeout = 3
-    self.read_timeout = 240
+    self.read_timeout = 60
 
     #
     # Update the configuration of the Rest API.  Use instead of

console/test/functional/applications_controller_test.rb

@@ -336,6 +336,17 @@ class ApplicationsControllerTest < ActionController::TestCase
     assert_select 'h1', /Application 'idontexist' does not exist/
   end
 
+  test "should result in error message when app creation times out" do
+    with_domain
+    Application.any_instance.expects(:save).raises(ActiveResource::TimeoutError.new('Timeout'))
+    post(:create, {:application => get_post_form})
+    assert app = assigns(:application)
+    assert !app.persisted?
+    assert_response :success
+    assert_template 'application_types/show'
+    assert_select '.alert.alert-error', /The application creation timed out/i
+  end
+
   test 'invalid destroy should render page' do
     Application.any_instance.expects(:destroy).returns(false)
     delete :destroy, :id => with_app.name