loolwsd/test/TileCacheTests.cpp | 6 ++++++ loolwsd/test/test.cpp | 1 + 2 files changed, 7 insertions(+)
New commits: commit 7a2a1b1b9917d4b8ccf8871c6024921d97c4dd06 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Oct 4 11:04:36 2016 +0300 Add another FIXME rant diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp index d5e18c9..3590a06 100644 --- a/loolwsd/test/TileCacheTests.cpp +++ b/loolwsd/test/TileCacheTests.cpp @@ -271,6 +271,12 @@ void TileCacheTests::testCancelTilesMultiView() getTileMessage(*socket2, "cancelTilesMultiView-2 "); } + // FIXME: Note that especially when this is run on a loaded machine, the server might not honor + // the 'canceltiles' but still send out a tile, or it has already sent the tile before it even + // gets the 'canceltiles'. That is not an error. It is a bit silly to have it cause an assertion + // failure here. Transient failures make a unit test worse than no unit test. Should we remove + // this testCancelTilesMultiView altogether? + assertNotInResponse(socket1, "tile:", "cancelTilesMultiView-1 "); assertNotInResponse(socket2, "tile:", "cancelTilesMultiView-2 "); } commit dba94a9c0371cee7a242611583307772ef10969d Author: Tor Lillqvist <t...@collabora.com> Date: Tue Oct 4 11:04:22 2016 +0300 Avoid annoying line wrapping of cppunit output diff --git a/loolwsd/test/test.cpp b/loolwsd/test/test.cpp index d0404dd..d93ccf9 100644 --- a/loolwsd/test/test.cpp +++ b/loolwsd/test/test.cpp @@ -94,6 +94,7 @@ int main(int /*argc*/, char** /*argv*/) runner.run(controller); CPPUNIT_NS::CompilerOutputter outputter(&result, std::cerr); + outputter.setNoWrap(); outputter.write(); return result.wasSuccessful() ? 0 : 1; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits