Rest-api-spec repo has been merged with elasticsearch proper

Changing the git submodule and moving it top level to avoid traversing the es source code during test discovery
messias72 · Dec 28, 2013 · f7d7931 · f7d7931
1 parent d1e031a
commit f7d7931
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "test_elasticsearch/rest-api-spec"]
-	path = test_elasticsearch/rest-api-spec
-	url = https://github.com/elasticsearch/elasticsearch-rest-api-spec.git
+[submodule "rest-api-spec"]
+	path = rest-api-spec
+	url = https://github.com/elasticsearch/elasticsearch.git
diff --git a/rest-api-spec b/rest-api-spec
diff --git a/test_elasticsearch/rest-api-spec b/test_elasticsearch/rest-api-spec
diff --git a/test_elasticsearch/test_server/test_common.py b/test_elasticsearch/test_server/test_common.py
@@ -191,9 +191,8 @@ def m(self):
 YAML_DIR = environ.get(
     'YAML_TEST_DIR',
     join(
-        dirname(__file__),
-        pardir, 
-        'rest-api-spec', 'test'
+        dirname(__file__), pardir, pardir,
+        'rest-api-spec', 'rest-api-spec', 'test'
     )
 )