From f0b0f4ad4c6f90b1b3b23e6a048ebda8e62cb254 Mon Sep 17 00:00:00 2001
From: "Kevin L. Mitchell" <kevin.mitchell@rackspace.com>
Date: Fri, 17 Jun 2011 17:33:00 +0000
Subject: Remove thirdwheel.py and do the test with a now-public
 ExtensionManager.add_extension()

---
 nova/api/openstack/extensions.py                  |  4 ++--
 nova/tests/api/openstack/extensions/thirdwheel.py | 24 -----------------------
 nova/tests/api/openstack/test_extensions.py       |  6 ++++++
 3 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 nova/tests/api/openstack/extensions/thirdwheel.py

diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 28d9d9192..da06ecd15 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -414,9 +414,9 @@ class ExtensionManager(object):
                               'file': ext_path})
                     continue
                 new_ext = new_ext_class()
-                self._add_extension(new_ext)
+                self.add_extension(new_ext)
 
-    def _add_extension(self, ext):
+    def add_extension(self, ext):
         # Do nothing if the extension doesn't check out
         if not self._check_extension(ext):
             return
diff --git a/nova/tests/api/openstack/extensions/thirdwheel.py b/nova/tests/api/openstack/extensions/thirdwheel.py
deleted file mode 100644
index c0c56f02c..000000000
--- a/nova/tests/api/openstack/extensions/thirdwheel.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
-#
-#    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.
-
-
-class Thirdwheel(object):
-    def __init__(self):
-        pass
-
-    def get_alias(self):
-        return "THIRD"
diff --git a/nova/tests/api/openstack/test_extensions.py b/nova/tests/api/openstack/test_extensions.py
index dd7d9f7b0..697c62e5c 100644
--- a/nova/tests/api/openstack/test_extensions.py
+++ b/nova/tests/api/openstack/test_extensions.py
@@ -128,6 +128,11 @@ class ResourceExtensionTest(unittest.TestCase):
         self.assertEqual(response_body, response.body)
 
 
+class InvalidExtension(object):
+    def get_alias(self):
+        return "THIRD"
+
+
 class ExtensionManagerTest(unittest.TestCase):
 
     response_body = "Try to say this Mr. Knox, sir..."
@@ -148,6 +153,7 @@ class ExtensionManagerTest(unittest.TestCase):
         app = openstack.APIRouterV11()
         ext_midware = extensions.ExtensionMiddleware(app)
         ext_mgr = ext_midware.ext_mgr
+        ext_mgr.add_extension(InvalidExtension())
         self.assertTrue('FOXNSOX' in ext_mgr.extensions)
         self.assertTrue('THIRD' not in ext_mgr.extensions)
 
-- 
cgit