Nik Everett
e8ccdf91fc
Merge pull request #12610 from nik9000/bug/12504_2.0
...
Plugin script: Fix spaces
2015-08-04 09:05:38 -04:00
Clinton Gormley
d0bd769b85
Added missing dependency to check-license script
2015-08-04 15:00:50 +02:00
Simon Willnauer
9b342733e0
Merge pull request #12636 from s1monw/forbid_default_timezone
...
Use UTC instead of default timezone for creation date in CAT endpoint
2015-08-04 14:54:43 +02:00
Simon Willnauer
2b2657279d
Use UTC instead of default timezone for creation date in CAT endpoint
...
this change was added recently which uses default timezone for the creation
date on CAT endpoints. We should be consistent and use UTC across the board.
This commit adds #getDefaultTimzone() to forbidden API and fixes the REST tests.
Relates to #11688
2015-08-04 14:38:23 +02:00
Clinton Gormley
18cb9eb2ec
Merge pull request #12631 from clintongormley/license_check_for_dirs
...
The check-license script now accepts either a directory or a .zip file only
Closes #12528
2015-08-04 14:17:57 +02:00
Robert Muir
5059c978e3
Fix distribution checks to pass unzipped directory to license checker
2015-08-04 07:54:55 -04:00
Clinton Gormley
20a5fc7e30
The check-license script now accepts either a directory or a .zip file only
...
Called as:
check_license_and_sha.pl --check path/to/licenses path/to/extracted/package/
or
check_license_and_sha.pl --check path/to/licenses path/to/file.zip
2015-08-04 13:07:58 +02:00
Simon Willnauer
6753f7f03e
Cut over master to 2.0.0-SNAPSHOT
2015-08-04 10:54:12 +02:00
Tanguy Leroux
a74684473e
Move Streams.copyTo(String|Bytes)FromClasspath() into StreamsUtils
...
The Streams.copyTo(String|Bytes)FromClasspath() methods resolve resources using org.elasticsearch.io.Streams classloader. This is fine in elasticsearch core and when running tests but if used in a plugin this can lead to FileNotFoundExceptions at runtime because plugin are loaded in a dedicated classloader.
2015-08-04 10:11:18 +02:00
Adrien Grand
caca13c878
Merge pull request #12599 from jpountz/fix/PrioritizedEsThreadPoolExecutor_concurrency
...
Fix concurrency issue in PrioritizedEsThreadPoolExecutor.
2015-08-04 10:00:46 +02:00
Adrien Grand
2433f34459
Merge pull request #12590 from Kakakakakku/fix-doc
...
Fixed official api name in docs
2015-08-04 09:54:32 +02:00
Robert Muir
32339c0e3f
Merge pull request #12627 from rmuir/improve_site_integ_test
...
Improve site-example integ test to test served contents.
2015-08-03 23:58:19 -04:00
Robert Muir
a0a177222b
fix typo in assume() when running from IDE
2015-08-03 23:57:27 -04:00
Robert Muir
16da40eb63
Merge pull request #12626 from rmuir/fix_coverage_analysis
...
Fix coverage analysis. Two versions of jacoco were being used and creating jar hell
2015-08-03 23:56:48 -04:00
Robert Muir
64850c0539
Improve site-example integ test to test served contents.
...
Closes #12578
2015-08-03 23:47:36 -04:00
Robert Muir
0e0fef81b2
Fix coverage analysis. Two versions of jacoco were being used and creating jar hell
2015-08-03 23:08:18 -04:00
Robert Muir
45ad47581d
tone down these stress tests
2015-08-03 22:47:24 -04:00
Robert Muir
3b7316fb8d
Merge pull request #12625 from rmuir/git_sucks
...
NamingConventionTests should test subclasses of ESIntegTestCase end with IT
2015-08-03 21:57:14 -04:00
Robert Muir
c059101fbb
Fix missed test class
2015-08-03 21:56:43 -04:00
Robert Muir
d7cf5cd6af
NamingConventionTests should test subclasses of ESIntegTestCase end with IT
...
These are integration tests.
2015-08-03 21:34:53 -04:00
Robert Muir
9091f46602
Merge pull request #12624 from rmuir/faster_unit_tests
...
cleanup more abstract test class -> TestCase and integ -> IT
2015-08-03 21:19:51 -04:00
Robert Muir
2fe279d2a9
cleanup more abstract test class -> TestCase and integ -> IT
2015-08-03 21:07:21 -04:00
Ryan Ernst
e713bf2151
Merge pull request #12623 from rjernst/fix/10659
...
Rename base tests cases to use "TestCase" suffix
2015-08-03 17:51:07 -07:00
Ryan Ernst
1e12d03252
Tests: Rename base tests cases to use "TestCase" suffix
...
Most of the abstract base test classes we have were previously @Ignored.
However, there were also some other tests ignored. Having two ways to
quiet tests is confusing, and clearly it has caused some tests
to get lost in the fold.
This change moves all base test classes to use the "TestCase" suffix,
which is not picked up by the test class name pattern. It also removes
@Ignore from (almost) all tests, and adds it to forbidden apis.
And since we were renaming, I shorted base test class names to use
"ES" instead of "Elasticsearch". I type this a lot of types a day,
and I have heard others express a similar desire for a shorter name.
closes #10659
2015-08-03 17:43:00 -07:00
Lee Hinman
127a04ef43
Don't access pgp.mit.edu over HTTP
2015-08-03 17:52:39 -06:00
Ryan Ernst
f9df12363f
Merge pull request #12619 from rjernst/cleanup/integ-test-refs
...
Remove references to tests.slow and tests.integration
2015-08-03 16:52:19 -07:00
Ryan Ernst
d7544fb5a8
Tests: Remove references to tests.slow and tests.integration
...
Another follow up to #12617 .
2015-08-03 16:49:42 -07:00
Ryan Ernst
3c5b43a5bd
Merge pull request #12618 from rjernst/remove/forbid-slow-annotation
...
Forbid @Slow
2015-08-03 16:46:05 -07:00
Ryan Ernst
32a5c20b33
Tests: Forbid @Slow
...
Now that all uses of @Slow are gone, we can forbid this annotations use
so tests are not confusing. Follow up to #12617 .
2015-08-03 16:43:09 -07:00
Ryan Ernst
ae701e4f6e
Merge pull request #12617 from rjernst/remove/test-annotations
...
Remove uses of @Slow and @Integration
2015-08-03 16:35:03 -07:00
Ryan Ernst
6d0c106178
Fix testing docs to not mention @Slow or @Integration
2015-08-03 16:32:35 -07:00
Ryan Ernst
be941f0669
Tests: Remove uses of @Slow and @Integration
...
Now that integ tests are moved into `mvn verify`, we don't really have
a need for @Slow, and especially not @Integration. This removes
uses of the first, and completely removes uses of the latter.
2015-08-03 16:26:07 -07:00
Robert Muir
bfd2a39a24
Merge pull request #12616 from rmuir/integ_stragglers
...
Cut over some remaining integration tests to IT
2015-08-03 19:18:04 -04:00
Robert Muir
062feac80a
Cut over some remaining integration tests to IT
...
A few subclasses got missed here
2015-08-03 19:08:01 -04:00
Robert Muir
3867e43196
Merge pull request #12615 from rmuir/test_load_balancing
...
Give unit tests and integ tests separate load balancing
2015-08-03 18:56:04 -04:00
Robert Muir
d67d7b0fb0
Give unit tests and integ tests separate load balancing
...
This is a mess today, e.g. tophints shows you slow integ tests
after unit tests runs and so on.
Lets track them independently, so we can keep an eye on slow
unit tests and slow integ tests, and have good load balancing.
2015-08-03 18:40:30 -04:00
Ryan Ernst
d349deb9b7
Merge pull request #12613 from rjernst/refactor/integ-tests
...
Rename integ tests to IT suffix
2015-08-03 14:57:26 -07:00
Ryan Ernst
622d8a830e
Tests: Rename integ tests to IT suffix
...
This rename effectively moves all integration tests to be run with `mvn
verify`. `mvn test` now runs in about 2 mins. This is a follow up to
2015-08-03 14:42:34 -07:00
Robert Muir
9769477c9d
Merge pull request #12609 from rmuir/sane_permissions
...
improve sanity of securitymanager file permissions
2015-08-03 17:39:30 -04:00
Robert Muir
2623ce7960
Improve permissions checking in security tests and fix crazy pidfile parent permissions
2015-08-03 16:58:25 -04:00
Nik Everett
1b5bf17ae0
Plugin script: Fix spaces
...
Fixes ES_HOME with spaces and installing plugins from a local directory
with spaces.
Closes #12504
2015-08-03 15:40:18 -04:00
Robert Muir
be6f9a0196
improve sanity of securitymanager file permissions
...
conf/ and plugins/ do not need read-write access: this prevents a lot
of bad possibilities.
2015-08-03 14:43:40 -04:00
Nik Everett
c82717789c
Merge pull request #11688 from szroland/master
...
Add option to `_cat/indices` to return index creation date #11524
2015-08-03 14:42:18 -04:00
Roland
49273a7317
Merge pull request #1 from nik9000/cat_indices_times
...
[TESTS] cat indices times for UTC - timezones
2015-08-03 20:28:08 +02:00
Robert Muir
22a73d3e65
Merge pull request #12351 from rmuir/perms
...
Remove Environment.homeFile()
2015-08-03 13:21:22 -04:00
Robert Muir
e472cbed09
Merge branch 'master' into perms
...
Conflicts:
core/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java
2015-08-03 13:20:34 -04:00
David Pilato
ac89f43d11
Merge pull request #12604 from dadoonet/maven/rename-site-example
...
[build] rename site example plugin to site-example
2015-08-03 18:45:13 +02:00
David Pilato
1b0492f800
[build] rename site example plugin to site-example
...
Just to be consistent in plugin naming convention we have today: `plugin_type-plugin_name`
So it's a `site` plugin.
2015-08-03 18:41:04 +02:00
Nik Everett
2078100390
[TESTS] cat indices times for UTC - timezones
2015-08-03 11:46:27 -04:00
Robert Muir
0e027d82c9
Merge pull request #12602 from rmuir/core_integ_tests
...
Add integration test phase for elasticsearch core/
2015-08-03 10:15:37 -04:00