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

[Libreoffice Gerrit user]

 test/httpwstest.cpp |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit e9e1db61ccf558d7d8544e483676996305a87f47
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Dec 11 09:10:25 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Dec 11 09:10:43 2018 +0100

    HTTPWSTest::testRenderShapeSelection: this test expects an SVG generated by core 6.0
    
    So avoid the test with newer core, which generates a slightly different
    SVG.
    
    Change-Id: I9357530735640a40a176140e26ddeb334cd7e89f

diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index d3427d2bd..b8c59a177 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -2721,6 +2721,16 @@ void HTTPWSTest::testRenderShapeSelection()
 
         std::shared_ptr<LOOLWebSocket> socket = loadDocAndGetSocket(_uri, documentURL, testname);
 
+        int major = 0;
+        int minor = 0;
+        getServerVersion(socket, major, minor, testname);
+        if (major != 6 || minor != 0)
+        {
+            TST_LOG("Skipping test on incompatible client ["
+                    << major << '.' << minor << "], expected [6.0].");
+            return;
+        }
+
         sendTextFrame(socket, "uno .uno:SelectAll", testname);
         sendTextFrame(socket, "rendershapeselection mimetype=image/svg+xml", testname);
         std::vector<char> responseSVG = getResponseMessage(socket, "shapeselectioncontent:", testname);