livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-476: Make LoginListener::waitFor() take arbitrary predicate. 

This allows one of the tests to specifically waitFor() the completion status
update from LLLogin, rather than the next status update to come along: the
coroutine potentially emits a whole sequence of status updates before
completion.

Then the waitFor() overload that merely waits for the next status update is
implemented by passing that specific predicate to the other overload.
meow-7.2.2
Nat Goodspeed 2020-04-02 15:00:17 -04:00
parent 5ced20b1a9
commit fde7dad001
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
indra/viewer_components/login/tests/lllogin_test.cpp
View File

@ -36,16 +36,16 @@
#include "../lllogin.h"
// STL headers
// std headers
#include <iostream>
#include <chrono>
#include <iostream>
// external library headers
// other Linden headers
#include "llsd.h"
#include "../../../test/lltut.h"
#include "../../../test/lltestapp.h"
#include "../../../test/debug.h"
#include "../../../test/lltestapp.h"
#include "../../../test/lltut.h"
#include "llevents.h"
#include "lleventcoro.h"
#include "llsd.h"
#include "stringize.h"
#if LL_WINDOWS
@ -96,21 +96,24 @@ public:
size_t getCalls() const { return mCalls; }
LLSD waitFor(size_t prevcalls, F32 seconds) const
// wait for arbitrary predicate to become true
template <typename PRED>
LLSD waitFor(const std::string& desc, PRED&& pred, double seconds=2.0) const
{
// remember when we started waiting
auto start = std::chrono::system_clock::now();
// Break loop when the LLEventPump on which we're listening calls call()
while (getCalls() <= prevcalls)
// Break loop when the passed predicate returns true
while (! std::forward<PRED>(pred)())
{
// but if we've been spinning here too long, test failed
// how long have we been here, anyway?
auto now = std::chrono::system_clock::now();
// the default ratio for duration is seconds
std::chrono::duration<F32> elapsed = (now - start);
std::chrono::duration<double> elapsed = (now - start);
if (elapsed.count() > seconds)
{
tut::fail("LoginListener::waitFor() timed out");
tut::fail(STRINGIZE("LoginListener::waitFor() took more than "
<< seconds << " seconds waiting for " << desc));
}
// haven't yet received the new call, nor have we timed out --
// just wait
@ -120,6 +123,14 @@ public:
return lastEvent();
}
// wait for any call() calls beyond prevcalls
LLSD waitFor(size_t prevcalls, double seconds) const
{
return waitFor(STRINGIZE("more than " << prevcalls << " calls"),
[this, prevcalls]()->bool{ return getCalls() > prevcalls; },
seconds);
}
friend std::ostream& operator<<(std::ostream& out, const LoginListener& listener)
{
return out << "LoginListener(" << listener.mName << ')';
@ -234,9 +245,9 @@ namespace tut
credentials["passwd"] = "secret";
login.connect("login.bar.com", credentials);
llcoro::suspend();
ensure_equals("Online state", listener.lastEvent()["state"].asString(), "online");
listener.waitFor(
"online state",
[&listener]()->bool{ return listener.lastEvent()["state"].asString() == "online"; });
}
template<> template<>