test/httpcrashtest.cpp | 2 +-
test/httpwserror.cpp | 2 +-
test/run_unit.sh.in | 1 -
wsd/LOOLWSD.cpp | 3 ++-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9c14446c88b2b00077132a37be48351d48e0eda1
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Apr 17 00:39:56 2017 -0400
wsd: re-enable a couple more tests that are stable
Change-Id: I01bc96ce7bde7cac10d0b4d023b0d5dd774ed058
Reviewed-on: https://gerrit.libreoffice.org/36602
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/test/httpcrashtest.cpp b/test/httpcrashtest.cpp
index deeed990..b6230d5a 100644
--- a/test/httpcrashtest.cpp
+++ b/test/httpcrashtest.cpp
@@ -56,7 +56,7 @@ class HTTPCrashTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST_SUITE(HTTPCrashTest);
CPPUNIT_TEST(testBarren);
- // FIXME CPPUNIT_TEST(testCrashKit);
+ CPPUNIT_TEST(testCrashKit);
CPPUNIT_TEST(testRecoverAfterKitCrash);
CPPUNIT_TEST(testCrashForkit);
diff --git a/test/httpwserror.cpp b/test/httpwserror.cpp
index a0663f63..7af7aa5a 100644
--- a/test/httpwserror.cpp
+++ b/test/httpwserror.cpp
@@ -40,7 +40,7 @@ class HTTPWSError : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST_SUITE(HTTPWSError);
CPPUNIT_TEST(testBadDocLoadFail);
- // FIXME CPPUNIT_TEST(testMaxDocuments);
+ CPPUNIT_TEST(testMaxDocuments);
CPPUNIT_TEST(testMaxConnections);
CPPUNIT_TEST(testMaxViews);
diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 32d7ba2d..4ac7fb30 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -82,7 +82,6 @@ if test "z$tst" == "z"; then
--o:admin_console.username=admin
--o:admin_console.password=admin \
> "$tst_log" 2>&1 &
echo " executing test"
- sleep 5 # allow for wsd to startup
oldpath=`pwd`
cd "${abs_top_builddir}/test"
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 21b046e5..c432a862 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1664,7 +1664,8 @@ private:
{
// TODO: Send back failure.
// NOTE: Check _wsState to choose between HTTP response or
WebSocket (app-level) error.
- LOG_ERR("#" << socket->getFD() << " Exception while processing
incoming request: [" << LOOLProtocol::getAbbreviatedMessage(in) << "]");
+ LOG_ERR("#" << socket->getFD() << " Exception while processing
incoming request: [" <<
+ LOOLProtocol::getAbbreviatedMessage(in) << "]: " <<
exc.what());
}
return socketOwnership;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
