← Back to branch summary

~cerberus/nova/disk_config

« back to all changes in this revision

Viewing changes to nova/tests/integrated/integrated_helpers.py

  • Committer: matt.dietz at rackspace
  • Date: 2011-09-21 19:48:25 UTC
  • mfrom: (1511.1.98 nova)
  • Revision ID: matt.dietz@rackspace.com-20110921194825-zv1w4qonfh6o1j2u
Merge from trunk, updated failing tests and pep8

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/integrated/integrated_helpers.py
70
70
        self.stubs.Set(nova.image, 'get_image_service', fake_get_image_service)
71
71
 
72
72
        # set up services
73
 
        self.start_service('compute')
74
 
        self.start_service('volume')
75
 
        self.start_service('network')
76
 
        self.start_service('scheduler')
 
73
        self.compute = self.start_service('compute')
 
74
        self.volume = self.start_service('volume')
 
75
        self.network = self.start_service('network')
 
76
        self.scheduler = self.start_service('scheduler')
77
77
 
78
78
        self._start_api_service()
79
79