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

[Tamás Zolnai (via logerrit)]

 Makefile.am         |    2 +-
 test/httpwstest.cpp |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4fc7bc76dbe9ad4845cdeb5377e57c212cfb5acd
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Feb 12 19:17:13 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Feb 12 22:46:34 2020 +0100

    tests: Change the order of cypress-test and other tests.
    
    So we can see how stable the cypress tests are. Now other unit
    tests under tests folder are failing randomly, so it's hard to
    monitor the cypress tests.
    
    Enable one unstable unit test, which was disabled for the same
    reason.
    
    Change-Id: Ib1646de1647c9a2bdb769bbb6b92a5794dd7a598
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88559
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/Makefile.am b/Makefile.am
index c6d417185..d064de9c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ endif
 
 else
 
-SUBDIRS = . test loleaflet cypress_test
+SUBDIRS = . loleaflet cypress_test test
 
 export ENABLE_DEBUG
 
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 4a2ea298b..3f90fabca 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -41,8 +41,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 
     CPPUNIT_TEST(testSaveOnDisconnect);
     CPPUNIT_TEST(testSavePassiveOnDisconnect);
-    // This test is failing
-    //CPPUNIT_TEST(testReloadWhileDisconnecting);
+    CPPUNIT_TEST(testReloadWhileDisconnecting);
     CPPUNIT_TEST(testInactiveClient);
     CPPUNIT_TEST(testViewInfoMsg);
     CPPUNIT_TEST(testUndoConflict);