From 59590587199dfb065d6c0a98faa35e6b487f65ea Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Mon, 26 Oct 2015 21:02:25 +0100 Subject: [PATCH] Unique repository names for rest tests --- .../test/cat.repositories/10_basic.yaml | 12 ++++++------ .../rest-api-spec/test/cat.snapshots/10_basic.yaml | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yaml index 0c282b35205..c7eb9c1f930 100755 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yaml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yaml @@ -21,25 +21,25 @@ - do: snapshot.create_repository: - repository: repo1 + repository: test_cat_repo_1 body: type: fs settings: - location: "repo1_loc" + location: "test_cat_repo_1_loc" - do: snapshot.create_repository: - repository: repo2 + repository: test_cat_repo_2 body: type: fs settings: - location: "repo2_loc" + location: "test_cat_repo_2_loc" - do: cat.repositories: {} - match: $body: | - /^ repo1\s+ fs\s*\n - repo2\s+ fs\s*\n + /^ test_cat_repo_1\s+ fs\s*\n + test_cat_repo_2\s+ fs\s*\n $/ diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/10_basic.yaml index fb1a99afe33..4a4207fd629 100755 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/10_basic.yaml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/10_basic.yaml @@ -2,7 +2,7 @@ "Help": - do: cat.snapshots: - repository: repo1 + repository: test_cat_snapshots_1 help: true - match: @@ -24,15 +24,15 @@ - do: snapshot.create_repository: - repository: repo1 + repository: test_cat_snapshots_1 body: type: fs settings: - location: "repo1_loc" + location: "test_cat_snapshots_1_loc" - do: cat.snapshots: - repository: repo1 + repository: test_cat_snapshots_1 - match: $body: | @@ -58,19 +58,19 @@ - do: snapshot.create: - repository: repo1 + repository: test_cat_snapshots_1 snapshot: snap1 wait_for_completion: true - do: snapshot.create: - repository: repo1 + repository: test_cat_snapshots_1 snapshot: snap2 wait_for_completion: true - do: cat.snapshots: - repository: repo1 + repository: test_cat_snapshots_1 - match: $body: |