unity-scopes-api

Merge lp:~marcustomlinson/unity-scopes-api/fix_scope_state_notify_test into lp:unity-scopes-api/devel

  1. fix_scope_state_notify_test
  2. Merge into devel
Proposed by Marcus Tomlinson
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 368
Merged at revision: 368
Proposed branch: lp:~marcustomlinson/unity-scopes-api/fix_scope_state_notify_test
Merge into: lp:unity-scopes-api/devel
Diff against target: 12 lines (+1/-1)
1 file modified
test/gtest/scopes/Registry/Registry_test.cpp (+1/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scopes-api/fix_scope_state_notify_test
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+222012@code.launchpad.net

Commit message

Give testscopeB more time to timeout in scope_state_notify test

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
2--- test/gtest/scopes/Registry/Registry_test.cpp 2014-05-28 14:34:50 +0000
3+++ test/gtest/scopes/Registry/Registry_test.cpp 2014-06-04 10:19:24 +0000
4@@ -179,7 +179,7 @@
5 EXPECT_TRUE(r->is_scope_running("testscopeB"));
6
7 // check now that we get a callback when testscopeB terminates (timed out after 2s)
8- std::this_thread::sleep_for(std::chrono::seconds{3});
9+ std::this_thread::sleep_for(std::chrono::seconds{4});
10 EXPECT_TRUE(wait_for_state_update());
11 EXPECT_FALSE(testscopeB_state);
12 EXPECT_FALSE(r->is_scope_running("testscopeB"));

Subscribers

People subscribed via source and target branches

to all changes: