1
0
Fork 0
Commit Graph

13362 Commits

Author SHA1 Message Date
Simon Grätzer e0e00b0b6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
2017-04-13 17:48:52 +02:00
Simon Grätzer 866d8b7451 Fixing tests 2017-04-13 17:45:16 +02:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Simon Grätzer a0e25edac8 Fix a cluster test 2017-04-13 15:20:28 +02:00
Simon Grätzer 3dc603ad1a Fixing last two recovery tests 2017-04-13 10:45:52 +02:00
Wilfried Goesgens 6887cdbb43 lean on the ICU_DATA env that arangosh exposes. 2017-04-12 13:53:21 +02:00
Wilfried Goesgens 24fca9974d run the tests one time without reporting to debug windows issue 2017-04-12 12:58:11 +02:00
Wilfried Goesgens ccb2175904 exclude two testsuites to check whether this hinders jenkins 2017-04-12 11:15:38 +02:00
Wilfried Goesgens 839d44de80 another place where we need to know the testresult output directory 2017-04-11 17:06:52 +02:00
Jan Christoph Uhde 4c4d491eac Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixing transaction-no-commit
  Fixing create collections
2017-04-11 15:04:14 +02:00
Jan Christoph Uhde 028afb782d enable logtopic development for recovery tests
if extreme verbosity is set to true
2017-04-11 15:03:13 +02:00
Simon Grätzer 7610e0303b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	js/server/tests/recovery/create-collections.js
2017-04-11 13:42:15 +02:00
Simon Grätzer e418bfca26 Fixing create collections 2017-04-11 13:41:05 +02:00
Jan Christoph Uhde 44bc73266a fix test 2017-04-11 13:35:19 +02:00
Kaveh Vahedipour 001c2b4092 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-11 11:46:40 +02:00
Kaveh Vahedipour 28fbf8ec12 sensitivityEstimates do not belong in Current 2017-04-11 11:46:20 +02:00
hkernbach d160791569 fixed event ui bug 2017-04-11 10:58:59 +02:00
Simon Grätzer e2813114ea Merge conflict 2017-04-08 10:59:04 +02:00
Jan Christoph Uhde 56987e1ddd fix recovery tests 2017-04-07 16:52:51 +02:00
Wilfried Goesgens ab882744d9 on windows put the catch test next to the binaries so we can find the proper dll easily 2017-04-07 16:44:45 +02:00
Max Neunhoeffer 53b3a73486 Add a timeout option to <collection>.drop().
This is in particular used to allow the Schmutz to make progress
in the case of a long running transaction.
2017-04-07 15:52:19 +02:00
Jan Christoph Uhde 4fe6906463 fix recovery tests 2017-04-07 15:38:23 +02:00
Simon Grätzer 3a0f31dcf6 Fixing more recovery tests 2017-04-07 12:31:00 +02:00
Simon Grätzer fa199f2239 Moved more tests 2017-04-07 11:56:23 +02:00
Simon Grätzer f0eec23f1e Fixing tests 2017-04-07 11:38:42 +02:00
Simon Grätzer 42a79ed1ac Fixing counter WAL parsing 2017-04-07 11:26:52 +02:00
Jan Christoph Uhde 77da0794ce fix shell-foxx-manager-nightly-spec.js 2017-04-06 17:32:49 +02:00
Jan Christoph Uhde c58c0e533a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  fix enterprise branch detection so it doesn't trigger a full recompile
  fix detection of partial cmake configure
  fix detection of partial cmake configure
  one more place to choose the propper directory for unittest result files.
  remove debug print
  fixed issue: #2412
  fix crash
2017-04-06 17:31:47 +02:00
Jan Christoph Uhde b7bd1d9e59 fix shell-foxx-manager-nightly-spec.js 2017-04-06 17:31:21 +02:00
jsteemann ea299c1036 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 15:07:56 +02:00
Wilfried Goesgens 7507f0d756 one more place to choose the propper directory for unittest result files. 2017-04-06 14:54:09 +02:00
jsteemann e42813dafb split some tests 2017-04-06 14:28:38 +02:00
jsteemann 049d633a24 fixed tests 2017-04-06 14:22:31 +02:00
jsteemann a8f8587504 fix a test 2017-04-06 14:16:35 +02:00
jsteemann 1037537f0f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 13:32:03 +02:00
hkernbach 4f98c431e2 fixed issue: #2412 2017-04-06 13:31:44 +02:00
jsteemann d03135a4d3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 12:54:47 +02:00
Wilfried Goesgens bf3f68ee26 BUGFIX: when we don't start the server we mustn't try to attempt to clean up its db directories 2017-04-06 11:43:11 +02:00
jsteemann 6308615825 renamed test file 2017-04-06 11:21:17 +02:00
jsteemann 8b57f1996e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 11:19:41 +02:00
jsteemann 82fe6cf098 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 11:19:36 +02:00
Wilfried Goesgens 050d931446 Bugfix: we want the common _and_ the server tests. 2017-04-06 11:14:01 +02:00
Simon Grätzer 5603e1a6da Renaming test files 2017-04-06 10:29:40 +02:00
jsteemann 6ae5cec318 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 09:06:28 +02:00
Dan Larkin 1d9366b1f1 Moved/split more tests. 2017-04-05 16:09:46 -04:00
Andreas Streichardt 61f9f92c46 exclude longrunning tests 2017-04-05 18:47:44 +02:00
Dan Larkin 4ca2cf52d3 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-05 12:17:27 -04:00
Dan Larkin ff0efe8de8 Split/moved more test files. 2017-04-05 12:16:54 -04:00
Simon Grätzer b3743292e3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 17:43:49 +02:00
Simon Grätzer 19f220726e Fixed dump setup 2017-04-05 17:43:38 +02:00