← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/test_flavors.py

  • Committer: Cerberus
  • Date: 2011-02-28 17:39:23 UTC
  • mfrom: (749 nova)
  • mto: This revision was merged to the branch mainline in revision 762.
  • Revision ID: matt.dietz@rackspace.com-20110228173923-1e3upi2ddoc2j4xl
Merge from trunk and merge conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/test_flavors.py
15
15
#    License for the specific language governing permissions and limitations
16
16
#    under the License.
17
17
 
18
 
import unittest
19
 
 
20
18
import stubout
21
19
import webob
22
20
 
 
21
from nova import test
23
22
import nova.api
24
23
from nova.api.openstack import flavors
25
24
from nova.tests.api.openstack import fakes
26
25
 
27
26
 
28
 
class FlavorsTest(unittest.TestCase):
 
27
class FlavorsTest(test.TestCase):
29
28
    def setUp(self):
 
29
        super(FlavorsTest, self).setUp()
30
30
        self.stubs = stubout.StubOutForTesting()
31
31
        fakes.FakeAuthManager.auth_data = {}
32
32
        fakes.FakeAuthDatabase.data = {}
36
36
 
37
37
    def tearDown(self):
38
38
        self.stubs.UnsetAll()
 
39
        super(FlavorsTest, self).tearDown()
39
40
 
40
41
    def test_get_flavor_list(self):
41
42
        req = webob.Request.blank('/v1.0/flavors')
43
44
 
44
45
    def test_get_flavor_by_id(self):
45
46
        pass
46
 
 
47
 
if __name__ == '__main__':
48
 
    unittest.main()