Update Keystone code from official Github repository with branch Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

3 files changed, 50 insertions, 0 deletions

diff --git a/keystone-moon/keystone/tests/functional/__init__.py b/keystone-moon/keystone/tests/functional/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/keystone-moon/keystone/tests/functional/__init__.py
diff --git a/keystone-moon/keystone/tests/functional/shared/__init__.py b/keystone-moon/keystone/tests/functional/shared/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/keystone-moon/keystone/tests/functional/shared/__init__.py
diff --git a/keystone-moon/keystone/tests/functional/shared/test_running.py b/keystone-moon/keystone/tests/functional/shared/test_running.py
new file mode 100644
index 00000000..aed48ac2
--- /dev/null
+++ b/keystone-moon/keystone/tests/functional/shared/test_running.py
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import requests
+import testtools.matchers
+
+
+is_multiple_choices = testtools.matchers.Equals(
+    requests.status_codes.codes.multiple_choices)
+is_ok = testtools.matchers.Equals(requests.status_codes.codes.ok)
+
+admin_url = 'http://localhost:35357'
+public_url = 'http://localhost:5000'
+versions = ('v2.0', 'v3')
+
+
+class TestServerRunning(testtools.TestCase):
+
+    def test_admin_responds_with_multiple_choices(self):
+        resp = requests.get(admin_url)
+        self.assertThat(resp.status_code, is_multiple_choices)
+
+    def test_admin_versions(self):
+        for version in versions:
+            resp = requests.get(admin_url + '/' + version)
+            self.assertThat(
+                resp.status_code,
+                testtools.matchers.Annotate(
+                    'failed for version %s' % version, is_ok))
+
+    def test_public_responds_with_multiple_choices(self):
+        resp = requests.get(public_url)
+        self.assertThat(resp.status_code, is_multiple_choices)
+
+    def test_public_versions(self):
+        for version in versions:
+            resp = requests.get(public_url + '/' + version)
+            self.assertThat(
+                resp.status_code,
+                testtools.matchers.Annotate(
+                    'failed for version %s' % version, is_ok))