More robust, even if it takes longer.

This commit is contained in:
Martin Edenhofer 2016-09-08 08:44:40 +02:00
parent 88487ca3d9
commit 80084c5518
2 changed files with 15 additions and 15 deletions

View file

@ -110,8 +110,8 @@ class SessionBasicTest < ActiveSupport::TestCase
UserInfo.current_user_id = 2 UserInfo.current_user_id = 2
user = User.lookup(id: 1) user = User.lookup(id: 1)
collection_client1 = Sessions::Backend::Collections::Group.new(user, {}, false, '123-1', 2) collection_client1 = Sessions::Backend::Collections::Group.new(user, {}, false, '123-1', 3)
collection_client2 = Sessions::Backend::Collections::Group.new(user, {}, false, '234-2', 2) collection_client2 = Sessions::Backend::Collections::Group.new(user, {}, false, '234-2', 3)
# get whole collections # get whole collections
result1 = collection_client1.push result1 = collection_client1.push
@ -131,7 +131,7 @@ class SessionBasicTest < ActiveSupport::TestCase
# change collection # change collection
group = Group.first group = Group.first
group.touch group.touch
sleep 3 sleep 4
# get whole collections # get whole collections
result1 = collection_client1.push result1 = collection_client1.push
@ -148,8 +148,8 @@ class SessionBasicTest < ActiveSupport::TestCase
assert_equal(result1, result2, 'check collections') assert_equal(result1, result2, 'check collections')
# change collection # change collection
group = Group.create(name: 'SomeGroup::' + rand(999_999).to_s, active: true) group = Group.create(name: "SomeGroup::#{rand(999_999)}", active: true)
sleep 3 sleep 4
# get whole collections # get whole collections
result1 = collection_client1.push result1 = collection_client1.push
@ -159,7 +159,7 @@ class SessionBasicTest < ActiveSupport::TestCase
assert_equal(result1, result2, 'check collections') assert_equal(result1, result2, 'check collections')
# check again after create # check again after create
sleep 3 sleep 4
result1 = collection_client1.push result1 = collection_client1.push
assert(!result1, 'check collections - after create - recall') assert(!result1, 'check collections - after create - recall')
result2 = collection_client2.push result2 = collection_client2.push
@ -168,7 +168,7 @@ class SessionBasicTest < ActiveSupport::TestCase
# change collection # change collection
group.destroy group.destroy
sleep 3 sleep 4
# get whole collections # get whole collections
result1 = collection_client1.push result1 = collection_client1.push
@ -178,7 +178,7 @@ class SessionBasicTest < ActiveSupport::TestCase
assert_equal(result1, result2, 'check collections') assert_equal(result1, result2, 'check collections')
# check again after destroy # check again after destroy
sleep 3 sleep 4
result1 = collection_client1.push result1 = collection_client1.push
assert(!result1, 'check collections - after destroy - recall') assert(!result1, 'check collections - after destroy - recall')
result2 = collection_client2.push result2 = collection_client2.push
@ -222,7 +222,7 @@ class SessionBasicTest < ActiveSupport::TestCase
agent1.roles = roles agent1.roles = roles
assert(agent1.save, 'create/update agent1') assert(agent1.save, 'create/update agent1')
as_client1 = Sessions::Backend::ActivityStream.new(agent1, {}, false, '123-1', 2) as_client1 = Sessions::Backend::ActivityStream.new(agent1, {}, false, '123-1', 3)
# get as stream # get as stream
result1 = as_client1.push result1 = as_client1.push
@ -234,14 +234,14 @@ class SessionBasicTest < ActiveSupport::TestCase
assert(!result1, 'check as agent1 - recall') assert(!result1, 'check as agent1 - recall')
# next check should be empty # next check should be empty
sleep 3 sleep 4
result1 = as_client1.push result1 = as_client1.push
assert(!result1, 'check as agent1 - recall 2') assert(!result1, 'check as agent1 - recall 2')
agent1.update_attribute(:email, 'activity-stream-agent11@example.com') 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) ticket = Ticket.create(title: '12323', group_id: 1, priority_id: 1, state_id: 1, customer_id: 1)
sleep 3 sleep 4
# get as stream # get as stream
result1 = as_client1.push result1 = as_client1.push
@ -252,7 +252,7 @@ class SessionBasicTest < ActiveSupport::TestCase
UserInfo.current_user_id = 2 UserInfo.current_user_id = 2
user = User.lookup(id: 1) user = User.lookup(id: 1)
ticket_create_client1 = Sessions::Backend::TicketCreate.new(user, {}, false, '123-1', 2) ticket_create_client1 = Sessions::Backend::TicketCreate.new(user, {}, false, '123-1', 3)
# get as stream # get as stream
result1 = ticket_create_client1.push result1 = ticket_create_client1.push
@ -268,9 +268,9 @@ class SessionBasicTest < ActiveSupport::TestCase
result1 = ticket_create_client1.push result1 = ticket_create_client1.push
assert(!result1, 'check ticket_create - recall 2') assert(!result1, 'check ticket_create - recall 2')
Group.create(name: 'SomeTicketCreateGroup::' + rand(999_999).to_s, active: true) Group.create(name: "SomeTicketCreateGroup::#{rand(999_999)}", active: true)
sleep 3 sleep 4
# get as stream # get as stream
result1 = ticket_create_client1.push result1 = ticket_create_client1.push

View file

@ -268,7 +268,7 @@ class SessionEnhancedTest < ActiveSupport::TestCase
group = Group.first group = Group.first
group.touch group.touch
sleep 8 sleep 10
# check collections # check collections
collections = { collections = {