[tests] Do not re-trigger answered requests

This happens on real file sources when tiles expire or in case
of error. Here we only retry on error.
This commit is contained in:
Thiago Marcos P. Santos
2016-06-10 21:28:29 +03:00
parent b06176cf11
commit 2be2340c30
2 changed files with 14 additions and 4 deletions

View File

@@ -11,20 +11,24 @@ public:
}
~StubFileRequest() override {
fileSource.pending.erase(this);
fileSource.remove(this);
}
StubFileSource& fileSource;
};
StubFileSource::StubFileSource() {
timer.start(10ms, 10ms, [this] {
timer.start(1ms, 1ms, [this] {
// Explicit copy to avoid iterator invalidation if ~StubFileRequest gets called within the loop.
auto pending_ = pending;
for (auto& pair : pending_) {
optional<Response> res = std::get<1>(pair.second)(std::get<0>(pair.second));
if (res) {
std::get<2>(pair.second)(*res);
if (!res->error) {
remove(pair.first);
}
}
}
});
@@ -38,6 +42,13 @@ std::unique_ptr<AsyncRequest> StubFileSource::request(const Resource& resource,
return std::move(req);
}
void StubFileSource::remove(AsyncRequest* req) {
auto it = pending.find(req);
if (it != pending.end()) {
pending.erase(it);
}
}
optional<Response> StubFileSource::defaultResponse(const Resource& resource) {
switch (resource.kind) {
case Resource::Kind::Style:

View File

@@ -13,6 +13,7 @@ public:
~StubFileSource() override;
std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
void remove(AsyncRequest*);
using ResponseFunction = std::function<optional<Response> (const Resource&)>;
@@ -30,8 +31,6 @@ public:
ResponseFunction spriteImageResponse;
private:
friend class StubFileRequest;
// The default behavior is to throw if no per-kind callback has been set.
optional<Response> defaultResponse(const Resource&);