[Libreoffice-commits] online.git: 2 commits - loleaflet/spec loolwsd/LOOLWSD.cpp

[Mihai Varga]

 loleaflet/spec/headlessLoadTest.js |    2 +-
 loolwsd/LOOLWSD.cpp                |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5396a83c26078aae14a27882cf0312a1b723ff26
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Mon Sep 7 15:56:47 2015 +0300

    loolwsd: copy /etc/hosts when running the server

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 33fa261..b1154b0 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -900,6 +900,11 @@ void LOOLWSD::desktopMain()
     {
         resolv.copyTo(Path(jail, "/etc").toString());
     }
+    File hosts("/etc/hosts");
+    if (hosts.exists())
+    {
+        hosts.copyTo(Path(jail, "/etc").toString());
+    }
 #ifdef __linux
     // Create the urandom and random devices
     File(Path(jail, "/dev")).createDirectory();
commit d7a1ffbe261579a131350316efb4665f6dee7a4f
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Mon Sep 7 10:24:30 2015 +0300

    loleaflet: 20s timeout for loadtest

diff --git a/loleaflet/spec/headlessLoadTest.js b/loleaflet/spec/headlessLoadTest.js
index fa88982..f9d5340 100644
--- a/loleaflet/spec/headlessLoadTest.js
+++ b/loleaflet/spec/headlessLoadTest.js
@@ -9,7 +9,7 @@ if (typeof String.prototype.startsWith != 'function') {
 
 describe('LoadTest', function () {
 	// 10s timeout
-	this.timeout(10000);
+	this.timeout(20000);
 	// set the slow time to 5ms knowing each test takes more than that,
 	// so the run time is always printed
 	this.slow(5);