[Libreoffice-commits] online.git: 2 commits - loolwsd/test

[Tor Lillqvist]

 loolwsd/test/httpwstest.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8743e4bc858124c0942fe9ebe0d58889ebe5730a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 22 20:16:16 2016 +0200

    Add comment that testConnectNoLoad does not fail all the time

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index b679e74..1e65fc2 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -62,7 +62,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(testBadRequest);
     CPPUNIT_TEST(testHandShake);
     CPPUNIT_TEST(testCloseAfterClose);
-    CPPUNIT_TEST(testConnectNoLoad);
+    CPPUNIT_TEST(testConnectNoLoad); // This fails most of the times but occasionally succeeds
     CPPUNIT_TEST(testLoad);
     CPPUNIT_TEST(testBadLoad);
     CPPUNIT_TEST(testReload);
commit c1fc1b33ab52b05dee66df612751710b0c3f4a55
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 22 20:07:11 2016 +0200

    Change a few spurious messages to go to stderr as they should
    
    Stdout is supposed to only get the "HTTPWSTest::testFontList. : OK"
    style output.

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 93a024b..b679e74 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -318,7 +318,7 @@ void HTTPWSTest::testCloseAfterClose()
 
         // no more messages is received.
         bytes = socket->receiveFrame(buffer, sizeof(buffer), flags);
-        std::cout << "Received " << bytes << " bytes, flags: "<< std::hex << flags << std::dec << std::endl;
+        std::cerr << "Received " << bytes << " bytes, flags: "<< std::hex << flags << std::dec << std::endl;
         CPPUNIT_ASSERT_EQUAL(0, bytes);
         CPPUNIT_ASSERT_EQUAL(0, flags);
     }
@@ -527,7 +527,7 @@ void HTTPWSTest::testReloadWhileDisconnecting()
         socket->shutdown();
 
         // Load the same document and check that the last changes (pasted text) is saved.
-        std::cout << "Loading again." << std::endl;
+        std::cerr << "Loading again." << std::endl;
         socket = loadDocAndGetSocket(_uri, documentURL, testname);
 
         // Should have no new instances.
@@ -1344,7 +1344,7 @@ void HTTPWSTest::testCalcEditRendering()
     sendTextFrame(socket, req);
 
     const auto tile = getResponseMessage(socket, "tile:", testname);
-    std::cout << "size: " << tile.size() << std::endl;
+    std::cerr << "size: " << tile.size() << std::endl;
 
     // Return early for now when on LO >= 5.2.
     std::string clientVersion = "loolclient 0.1";