← Back to branch summary

~ubuntu-branches/ubuntu/trusty/cinder/trusty

« back to all changes in this revision

Viewing changes to cinder/tests/integrated/test_volumes.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-11-23 08:39:28 UTC
  • mfrom: (1.1.9)
  • Revision ID: package-import@ubuntu.com-20121123083928-xvzet603cjfj9p1t
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1075948
* New upstream release.
* debian/patches/avoid_setuptools_git_dependency.patch:
  Avoid git installation. (LP: #1075948) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
cinder/tests/integrated/test_volumes.py
18
18
import time
19
19
import unittest
20
20
 
 
21
from cinder.openstack.common import log as logging
21
22
from cinder import service
22
 
from cinder.openstack.common import log as logging
 
23
from cinder.tests import fake_driver
 
24
from cinder.tests.integrated.api import client
23
25
from cinder.tests.integrated import integrated_helpers
24
 
from cinder.tests.integrated.api import client
25
26
from cinder.volume import driver
26
27
 
27
28
 
31
32
class VolumesTest(integrated_helpers._IntegratedTestBase):
32
33
    def setUp(self):
33
34
        super(VolumesTest, self).setUp()
34
 
        driver.LoggingVolumeDriver.clear_logs()
 
35
        fake_driver.LoggingVolumeDriver.clear_logs()
35
36
 
36
37
    def _start_api_service(self):
37
38
        self.osapi = service.WSGIService("osapi_volume")
41
42
 
42
43
    def _get_flags(self):
43
44
        f = super(VolumesTest, self)._get_flags()
44
 
        f['use_local_volumes'] = False  # Avoids calling local_path
45
 
        f['volume_driver'] = 'cinder.volume.driver.LoggingVolumeDriver'
 
45
        f['volume_driver'] = 'cinder.tests.fake_driver.LoggingVolumeDriver'
46
46
        return f
47
47
 
48
48
    def test_get_volumes_summary(self):
114
114
        # Should be gone
115
115
        self.assertFalse(found_volume)
116
116
 
117
 
        LOG.debug("Logs: %s" % driver.LoggingVolumeDriver.all_logs())
 
117
        LOG.debug("Logs: %s" % fake_driver.LoggingVolumeDriver.all_logs())
118
118
 
119
 
        create_actions = driver.LoggingVolumeDriver.logs_like(
 
119
        create_actions = fake_driver.LoggingVolumeDriver.logs_like(
120
120
                            'create_volume',
121
121
                            id=created_volume_id)
122
122
        LOG.debug("Create_Actions: %s" % create_actions)
127
127
        self.assertEquals(create_action['availability_zone'], 'nova')
128
128
        self.assertEquals(create_action['size'], 1)
129
129
 
130
 
        export_actions = driver.LoggingVolumeDriver.logs_like(
 
130
        export_actions = fake_driver.LoggingVolumeDriver.logs_like(
131
131
                            'create_export',
132
132
                            id=created_volume_id)
133
133
        self.assertEquals(1, len(export_actions))
135
135
        self.assertEquals(export_action['id'], created_volume_id)
136
136
        self.assertEquals(export_action['availability_zone'], 'nova')
137
137
 
138
 
        delete_actions = driver.LoggingVolumeDriver.logs_like(
 
138
        delete_actions = fake_driver.LoggingVolumeDriver.logs_like(
139
139
                            'delete_volume',
140
140
                            id=created_volume_id)
141
141
        self.assertEquals(1, len(delete_actions))