From b625a6563a5dc63da393c3c35342940c891adee2 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 25 Feb 2015 22:35:37 +0100
Subject: [PATCH] Small testing improvements.

---
 lib/sessions/backend/ticket_overview_index.rb |  3 +--
 lib/sessions/backend/ticket_overview_list.rb  |  3 +--
 test/test_helper.rb                           |  7 ++++---
 test/unit/session_basic_test.rb               | 18 +++++++++---------
 test/unit/session_basic_ticket_test.rb        |  8 ++++----
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/lib/sessions/backend/ticket_overview_index.rb b/lib/sessions/backend/ticket_overview_index.rb
index ca81bf326..050c39458 100644
--- a/lib/sessions/backend/ticket_overview_index.rb
+++ b/lib/sessions/backend/ticket_overview_index.rb
@@ -33,8 +33,7 @@ class Sessions::Backend::TicketOverviewIndex
   def push
 
     # check check interval
-    timeout = Sessions::CacheIn.get( self.client_key )
-    return if timeout
+    return if Sessions::CacheIn.get( self.client_key )
 
     # reset check interval
     Sessions::CacheIn.set( self.client_key, true, { :expires_in => 5.seconds } )
diff --git a/lib/sessions/backend/ticket_overview_list.rb b/lib/sessions/backend/ticket_overview_list.rb
index f0d8546b0..6c9434122 100644
--- a/lib/sessions/backend/ticket_overview_list.rb
+++ b/lib/sessions/backend/ticket_overview_list.rb
@@ -43,8 +43,7 @@ class Sessions::Backend::TicketOverviewList
   def push
 
     # check interval
-    timeout = Sessions::CacheIn.get( self.client_key )
-    return if timeout
+    return if Sessions::CacheIn.get( self.client_key )
 
     # reset check interval
     Sessions::CacheIn.set( self.client_key, true, { :expires_in => 6.seconds } )
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 087ac1313..3b4960887 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -28,12 +28,13 @@ class ActiveSupport::TestCase
 
   setup do
 
+    # clear cache
+    Cache.clear
+
     # set current user
     puts 'reset UserInfo.current_user_id'
     UserInfo.current_user_id = nil
   end
 
   # Add more helper methods to be used by all tests here...
-end
-
-
+end
\ No newline at end of file
diff --git a/test/unit/session_basic_test.rb b/test/unit/session_basic_test.rb
index 7356df3b2..fe9142b47 100644
--- a/test/unit/session_basic_test.rb
+++ b/test/unit/session_basic_test.rb
@@ -71,7 +71,7 @@ class SessionBasicTest < ActiveSupport::TestCase
     # change collection
     group = Group.first
     group.touch
-    sleep 16
+    sleep 12
 
     # get whole collections
     result1 = collection_client1.push
@@ -102,7 +102,7 @@ class SessionBasicTest < ActiveSupport::TestCase
     assert_equal( result1, result2, "check collections" )
 
     # check again after create
-    sleep 14
+    sleep 12
     result1 = collection_client1.push
     assert( !result1, "check collections - after create - recall" )
     sleep 1
@@ -112,7 +112,7 @@ class SessionBasicTest < ActiveSupport::TestCase
 
     # change collection
     group.destroy
-    sleep 14
+    sleep 12
 
     # get whole collections
     result1 = collection_client1.push
@@ -163,7 +163,7 @@ class SessionBasicTest < ActiveSupport::TestCase
 
     # change collection
     org = Organization.create( :name => 'SomeOrg2::' + rand(999999).to_s, :active => true )
-    sleep 16
+    sleep 12
 
     # get whole collections
     result1 = collection_client1.push
@@ -173,7 +173,7 @@ class SessionBasicTest < ActiveSupport::TestCase
     assert( !result2.empty?, "check collections - after create" )
     assert_equal( result1, result2, "check collections" )
 
-    sleep 16
+    sleep 12
 
     # next check should be empty
     result1 = collection_client1.push
@@ -183,7 +183,7 @@ class SessionBasicTest < ActiveSupport::TestCase
 
     organization = Organization.first
     organization.touch
-    sleep 16
+    sleep 12
 
     # get whole collections
     result1 = collection_client1.push
@@ -241,14 +241,14 @@ class SessionBasicTest < ActiveSupport::TestCase
     assert( !result1, "check as agent1 - recall" )
 
     # next check should be empty
-    sleep 60
+    sleep 31
     result1 = as_client1.push
     assert( !result1, "check as agent1 - recall 2" )
 
     agent1.update_attribute( :email, 'activity-stream-agent11@example.com' )
     ticket = Ticket.create(:title => '12323', :group_id => 1, :priority_id => 1, :state_id => 1, :customer_id => 1 )
 
-    sleep 32
+    sleep 31
 
     # get as stream
     result1 = as_client1.push
@@ -271,7 +271,7 @@ class SessionBasicTest < ActiveSupport::TestCase
     assert( !result1, "check ticket_create - recall" )
 
     # next check should be empty
-    sleep 10
+    sleep 2
     result1 = ticket_create_client1.push
     assert( !result1, "check ticket_create - recall 2" )
 
diff --git a/test/unit/session_basic_ticket_test.rb b/test/unit/session_basic_ticket_test.rb
index c74a3f4b4..e9c5aec57 100644
--- a/test/unit/session_basic_ticket_test.rb
+++ b/test/unit/session_basic_ticket_test.rb
@@ -36,13 +36,13 @@ class SessionBasicTicketTest < ActiveSupport::TestCase
     assert( !result1, "check ticket_overview_index - recall" )
 
     # next check should be empty
-    sleep 10
+    sleep 8
     result1 = client1.push
     assert( !result1, "check ticket_overview_index - recall 2" )
 
     ticket = Ticket.create( :title => '12323', :group_id => 1, :priority_id => 1, :state_id => 1, :customer_id => 1 )
 
-    sleep 10
+    sleep 8
 
     # get as stream
     result1 = client1.push
@@ -84,13 +84,13 @@ class SessionBasicTicketTest < ActiveSupport::TestCase
     assert( !result1, "check ticket_overview_list - recall" )
 
     # next check should be empty
-    sleep 10
+    sleep 8
     result1 = client1.push
     assert( !result1, "check ticket_overview_list - recall 2" )
 
     ticket = Ticket.create( :title => '12323', :group_id => 1, :priority_id => 1, :state_id => 1, :customer_id => 1 )
 
-    sleep 10
+    sleep 8
 
     # get as stream
     result1 = client1.push