1 files changed, 0 insertions, 136 deletions
diff --git a/keystone-moon/keystone/tests/unit/test_v3_os_revoke.py b/keystone-moon/keystone/tests/unit/test_v3_os_revoke.py
deleted file mode 100644
index 5fb5387a..00000000
--- a/keystone-moon/keystone/tests/unit/test_v3_os_revoke.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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 datetime
-import uuid
-
-from oslo_utils import timeutils
-import six
-from six.moves import http_client
-from testtools import matchers
-
-from keystone.common import utils
-from keystone.models import revoke_model
-from keystone.tests.unit import test_v3
-from keystone.token import provider
-
-
-def _future_time_string():
-    expire_delta = datetime.timedelta(seconds=1000)
-    future_time = timeutils.utcnow() + expire_delta
-    return utils.isotime(future_time)
-
-
-class OSRevokeTests(test_v3.RestfulTestCase, test_v3.JsonHomeTestMixin):
-
-    JSON_HOME_DATA = {
-        'http://docs.openstack.org/api/openstack-identity/3/ext/OS-REVOKE/1.0/'
-        'rel/events': {
-            'href': '/OS-REVOKE/events',
-        },
-    }
-
-    def test_get_empty_list(self):
-        resp = self.get('/OS-REVOKE/events')
-        self.assertEqual([], resp.json_body['events'])
-
-    def _blank_event(self):
-        return {}
-
-    # The two values will be the same with the exception of
-    # 'issued_before' which is set when the event is recorded.
-    def assertReportedEventMatchesRecorded(self, event, sample, before_time):
-        after_time = timeutils.utcnow()
-        event_issued_before = timeutils.normalize_time(
-            timeutils.parse_isotime(event['issued_before']))
-        self.assertTrue(
-            before_time <= event_issued_before,
-            'invalid event issued_before time; %s is not later than %s.' % (
-                utils.isotime(event_issued_before, subsecond=True),
-                utils.isotime(before_time, subsecond=True)))
-        self.assertTrue(
-            event_issued_before <= after_time,
-            'invalid event issued_before time; %s is not earlier than %s.' % (
-                utils.isotime(event_issued_before, subsecond=True),
-                utils.isotime(after_time, subsecond=True)))
-        del (event['issued_before'])
-        self.assertEqual(sample, event)
-
-    def test_revoked_list_self_url(self):
-        revoked_list_url = '/OS-REVOKE/events'
-        resp = self.get(revoked_list_url)
-        links = resp.json_body['links']
-        self.assertThat(links['self'], matchers.EndsWith(revoked_list_url))
-
-    def test_revoked_token_in_list(self):
-        user_id = uuid.uuid4().hex
-        expires_at = provider.default_expire_time()
-        sample = self._blank_event()
-        sample['user_id'] = six.text_type(user_id)
-        sample['expires_at'] = six.text_type(utils.isotime(expires_at))
-        before_time = timeutils.utcnow()
-        self.revoke_api.revoke_by_expiration(user_id, expires_at)
-        resp = self.get('/OS-REVOKE/events')
-        events = resp.json_body['events']
-        self.assertEqual(1, len(events))
-        self.assertReportedEventMatchesRecorded(events[0], sample, before_time)
-
-    def test_disabled_project_in_list(self):
-        project_id = uuid.uuid4().hex
-        sample = dict()
-        sample['project_id'] = six.text_type(project_id)
-        before_time = timeutils.utcnow()
-        self.revoke_api.revoke(
-            revoke_model.RevokeEvent(project_id=project_id))
-
-        resp = self.get('/OS-REVOKE/events')
-        events = resp.json_body['events']
-        self.assertEqual(1, len(events))
-        self.assertReportedEventMatchesRecorded(events[0], sample, before_time)
-
-    def test_disabled_domain_in_list(self):
-        domain_id = uuid.uuid4().hex
-        sample = dict()
-        sample['domain_id'] = six.text_type(domain_id)
-        before_time = timeutils.utcnow()
-        self.revoke_api.revoke(
-            revoke_model.RevokeEvent(domain_id=domain_id))
-
-        resp = self.get('/OS-REVOKE/events')
-        events = resp.json_body['events']
-        self.assertEqual(1, len(events))
-        self.assertReportedEventMatchesRecorded(events[0], sample, before_time)
-
-    def test_list_since_invalid(self):
-        self.get('/OS-REVOKE/events?since=blah',
-                 expected_status=http_client.BAD_REQUEST)
-
-    def test_list_since_valid(self):
-        resp = self.get('/OS-REVOKE/events?since=2013-02-27T18:30:59.999999Z')
-        events = resp.json_body['events']
-        self.assertEqual(0, len(events))
-
-    def test_since_future_time_no_events(self):
-        domain_id = uuid.uuid4().hex
-        sample = dict()
-        sample['domain_id'] = six.text_type(domain_id)
-
-        self.revoke_api.revoke(
-            revoke_model.RevokeEvent(domain_id=domain_id))
-
-        resp = self.get('/OS-REVOKE/events')
-        events = resp.json_body['events']
-        self.assertEqual(1, len(events))
-
-        resp = self.get('/OS-REVOKE/events?since=%s' % _future_time_string())
-        events = resp.json_body['events']
-        self.assertEqual([], events)