Merge branch 'master' into plugin-integration-tests

Conflicts:
	core/pom.xml
This commit is contained in:
Robert Muir 2015-07-06 15:15:15 -04:00
commit d7bc274690
3 changed files with 18 additions and 18 deletions

View File

@ -3,11 +3,11 @@ setup:
- do:
snapshot.create_repository:
repository: test_repo1
repository: test_repo_create_1
body:
type: fs
settings:
location: "test_repo1"
location: "test_repo_create_1_loc"
- do:
indices.create:
@ -26,7 +26,7 @@ setup:
- do:
snapshot.create:
repository: test_repo1
repository: test_repo_create_1
snapshot: test_snapshot
wait_for_completion: true

View File

@ -3,7 +3,7 @@ setup:
- do:
snapshot.create_repository:
repository: test_repo1
repository: test_repo_get_1
body:
type: url
settings:
@ -11,7 +11,7 @@ setup:
- do:
snapshot.create_repository:
repository: test_repo2
repository: test_repo_get_2
body:
type: url
settings:
@ -22,23 +22,23 @@ setup:
- do:
snapshot.get_repository: {}
- is_true: test_repo1
- is_true: test_repo2
- is_true: test_repo_get_1
- is_true: test_repo_get_2
---
"Get repository by name":
- do:
snapshot.get_repository:
repository: test_repo1
repository: test_repo_get_1
- is_true: test_repo1
- is_false: test_repo2
- is_true: test_repo_get_1
- is_false: test_repo_get_2
---
"Get missing repository by name":
- do:
snapshot.get_repository:
repository: test_repo2
repository: test_repo_get_2
---
"Get all repositories with local flag":
@ -46,13 +46,13 @@ setup:
snapshot.get_repository:
local: true
- is_true: test_repo1
- is_true: test_repo2
- is_true: test_repo_get_1
- is_true: test_repo_get_2
---
"Verify created repository":
- do:
snapshot.verify_repository:
repository: test_repo2
repository: test_repo_get_2
- is_true: nodes

View File

@ -3,11 +3,11 @@ setup:
- do:
snapshot.create_repository:
repository: test_repo1
repository: test_repo_restore_1
body:
type: fs
settings:
location: "test_repo1"
location: "test_repo_restore_1_loc"
- do:
indices.create:
@ -26,7 +26,7 @@ setup:
- do:
snapshot.create:
repository: test_repo1
repository: test_repo_restore_1
snapshot: test_snapshot
wait_for_completion: true
@ -41,7 +41,7 @@ setup:
- do:
snapshot.restore:
repository: test_repo1
repository: test_repo_restore_1
snapshot: test_snapshot
wait_for_completion: true