[Libreoffice-commits] online.git: test/httpwstest.cpp

[Ashod Nakashian]

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

New commits:
commit 9fbd810650184ac1e41df057333a4081f272c6a8
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Tue Apr 4 08:28:25 2017 -0400

    wsd: accept alternative slideshow export
    
    Apparently some setups produce a slightly different
    output than the expected. Here we tolerate for those
    outputs as well.
    
    Change-Id: Ia4beeb653ff6182e1403a59fbd05c6a46b9277ac
    Reviewed-on: https://gerrit.libreoffice.org/36080
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 55272f45..1be35140 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -59,7 +59,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(testBadRequest);
     CPPUNIT_TEST(testHandshake);
     CPPUNIT_TEST(testCloseAfterClose);
-    CPPUNIT_TEST(testConnectNoLoad); // This fails most of the times but occasionally succeeds
+    CPPUNIT_TEST(testConnectNoLoad);
     CPPUNIT_TEST(testLoadSimple);
     CPPUNIT_TEST(testLoadTortureODT);
     CPPUNIT_TEST(testLoadTortureODS);
@@ -1173,7 +1173,9 @@ void HTTPWSTest::testSlideShow()
         session->receiveResponse(responseSVG);
         CPPUNIT_ASSERT_EQUAL(Poco::Net::HTTPResponse::HTTP_OK, responseSVG.getStatus());
         CPPUNIT_ASSERT_EQUAL(std::string("image/svg+xml"), responseSVG.getContentType());
-        CPPUNIT_ASSERT_EQUAL(std::streamsize(451329), responseSVG.getContentLength());
+        // Some setups render differently; recognize these two valid output sizes for now.
+        CPPUNIT_ASSERT(responseSVG.getContentLength() == std::streamsize(451329) ||
+                       responseSVG.getContentLength() == std::streamsize(467345));
     }
     catch (const Poco::Exception& exc)
     {