From 177180ac94ea08709bc52036483319f722750be1 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Mon, 6 Jul 2015 14:16:28 -0400
Subject: [PATCH] Fix snapshot-related REST integration tests

---
 core/pom.xml                                  |  4 +++-
 .../test/snapshot.create/10_basic.yaml        |  6 ++---
 .../snapshot.get_repository/10_basic.yaml     | 22 +++++++++----------
 .../test/snapshot.restore/10_basic.yaml       |  8 +++----
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index b6f99958d5f..0a38323872b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1046,11 +1046,13 @@
 
                               <property name="integ.home" location="${integ.scratch}/${integ.finalname}"/>
 
+                              <property name="integ.repo.home" location="${integ.home}/repo"/>
+
                               <!-- execute -->
                               <property name="integ.args"
                                         value="-Des.node.name=smoke_tester -Des.cluster.name=prepare_release
                                                -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>
                               <exec executable="cmd" osfamily="winnt" dir="${integ.home}" spawn="true">
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yaml
index b341564e9b5..91080f99930 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yaml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yaml
@@ -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
 
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yaml
index d20acc9b630..5788453a739 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yaml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yaml
@@ -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
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/10_basic.yaml
index 8cc84ec3610..5fa734d3607 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/10_basic.yaml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/10_basic.yaml
@@ -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