← Back to branch summary

~ci-train-bot/unity-scopes-shell/unity-scopes-shell-ubuntu-zesty-2110

« back to all changes in this revision

Viewing changes to src/scope-harness/view/results-view.cpp

  • Committer: Bileto Bot
  • Date: 2016-09-21 05:52:01 UTC
  • mfrom: (339.1.13 trunk)
  • Revision ID: ci-train-bot@canonical.com-20160921055201-46ms8fxvd7kbhysm
Increase scope-harness timeouts to assist scope testing on slow builders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scope-harness/view/results-view.cpp
123
123
 
124
124
        if (!navigationModel->loaded())
125
125
        {
126
 
            TestUtils::throwIfNot(spy.wait(), "Department model failed to load");
 
126
            TestUtils::throwIfNot(spy.wait(SIG_SPY_TIMEOUT), "Department model failed to load");
127
127
        }
128
128
 
129
129
        return results::Department(internal::DepartmentArguments{navigationModel});
180
180
 
181
181
            if (!scope->searchInProgress())
182
182
            {
183
 
                spy.wait(100);
 
183
                spy.wait(2000);
184
184
            }
185
185
            if (scope->searchInProgress())
186
186
            {
187
 
                TestUtils::throwIfNot(spy.wait(), "Active scope didn't finish searching");
 
187
                TestUtils::throwIfNot(spy.wait(SIG_SPY_TIMEOUT), "Active scope didn't finish searching");
188
188
            }
189
189
 
190
190
            break;
223
223
    p->m_active_scope->setSearchQuery(searchString);
224
224
    // search should not be happening yet
225
225
    TestUtils::throwIf(p->m_active_scope->searchInProgress(), "Search was in progress too soon");
226
 
    TestUtils::throwIfNot(spy.wait(), "Search spy received no events");
 
226
    TestUtils::throwIfNot(spy.wait(SIG_SPY_TIMEOUT), "Search spy received no events");
227
227
    if (p->m_active_scope->searchInProgress())
228
228
    {
229
229
        // wait for the search to finish
230
 
        TestUtils::throwIfNot(spy.wait(), "Search spy received no events");
 
230
        TestUtils::throwIfNot(spy.wait(SIG_SPY_TIMEOUT), "Search spy received no events");
231
231
    }
232
232
    TestUtils::throwIf(p->m_active_scope->searchInProgress(), "Search did not complete");
233
233
}
246
246
    if (p->m_active_scope->searchInProgress())
247
247
    {
248
248
        // wait for the search to finish
249
 
        TestUtils::throwIfNot(spy.wait(), "Search spy received no events");
 
249
        TestUtils::throwIfNot(spy.wait(SIG_SPY_TIMEOUT), "Search spy received no events");
250
250
    }
251
251
    TestUtils::throwIf(p->m_active_scope->searchInProgress(), "Search did not complete");
252
252
}
258
258
    TestUtils::throwIf(p->m_active_scope->searchInProgress(), "Search is already in progress");
259
259
    // wait for the search to finish
260
260
    QSignalSpy spy(p->m_active_scope.data(), SIGNAL(searchInProgressChanged()));
261
 
    TestUtils::throwIfNot(spy.wait(), "Search status didn't change");
 
261
    TestUtils::throwIfNot(spy.wait(SIG_SPY_TIMEOUT), "Search status didn't change");
262
262
    if(spy.size() == 1) {
263
 
        TestUtils::throwIfNot(spy.wait(), "Search status didn't change");
 
263
        TestUtils::throwIfNot(spy.wait(SIG_SPY_TIMEOUT), "Search status didn't change");
264
264
    }
265
265
    TestUtils::throwIf(p->m_active_scope->searchInProgress(), "");
266
266
}