Fix snapshot-related REST integration tests

This commit is contained in:
Igor Motov 2015-07-06 14:16:28 -04:00
parent fb6daebe34
commit 177180ac94
4 changed files with 21 additions and 19 deletions

View File

@ -1046,11 +1046,13 @@
<property name="integ.home" location="${integ.scratch}/${integ.finalname}"/> <property name="integ.home" location="${integ.scratch}/${integ.finalname}"/>
<property name="integ.repo.home" location="${integ.home}/repo"/>
<!-- execute --> <!-- execute -->
<property name="integ.args" <property name="integ.args"
value="-Des.node.name=smoke_tester -Des.cluster.name=prepare_release value="-Des.node.name=smoke_tester -Des.cluster.name=prepare_release
-Des.discovery.zen.ping.multicast.enabled=false -Des.script.inline=on -Des.discovery.zen.ping.multicast.enabled=false -Des.script.inline=on
-Des.script.indexed=on"/> -Des.script.indexed=on -Des.path.repo=${integ.repo.home}"/>
<echo>Starting up external cluster...</echo> <echo>Starting up external cluster...</echo>
<exec executable="cmd" osfamily="winnt" dir="${integ.home}" spawn="true"> <exec executable="cmd" osfamily="winnt" dir="${integ.home}" spawn="true">

View File

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

View File

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

View File

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