Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 

* 'devel' of https://github.com/arangodb/arangodb:
  remove system stackframes from ruby output; lintify
  yield on shutdown
This commit is contained in:
Jan Christoph Uhde 2017-04-28 11:04:29 +02:00
parent 8df6e1c289 20a7c0e6b2
commit 1b1fb806fd
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/Scheduler/Scheduler.cpp
View File

@ -41,6 +41,8 @@
#include "Scheduler/JobQueue.h"
#include "Scheduler/Task.h"
#include <thread>
using namespace arangodb;
using namespace arangodb::basics;
using namespace arangodb::rest;
@ -429,8 +431,11 @@ void Scheduler::shutdown() {
bool done = false;
while (!done) {
MUTEX_LOCKER(guard, _threadsLock);
done = _threads.empty();
{
MUTEX_LOCKER(guard, _threadsLock);
done = _threads.empty();
}
std::this_thread::yield();
}
deleteOldThreads();

7
js/client/modules/@arangodb/testsuites/rspec.js
View File

@ -105,9 +105,11 @@ function rubyTests (options, ssl) {
'end\n';
fs.write(tmpname, rspecConfig);
if (options.extremeVerbosity === true){
print("rspecConfig: \n" + rspecConfig);
if (options.extremeVerbosity === true) {
print('rspecConfig: \n' + rspecConfig);
}
try {
fs.makeDirectory(pu.LOGS_DIR);
} catch (err) {}
@ -146,6 +148,7 @@ function rubyTests (options, ssl) {
const msg = yaml.safeDump(testCase)
.replace(/.*rspec\/core.*\n/gm, '')
.replace(/.*rspec\\core.*\n/gm, '')
.replace(/.*lib\/ruby.*\n/, '')
.replace(/.*- >-.*\n/gm, '')
.replace(/\n *`/gm, ' `');
print('RSpec test case falied: \n' + msg);