~ubuntu-branches/ubuntu/saucy/glance/saucy-proposed

« back to all changes in this revision

Viewing changes to glance/tests/unit/base.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-05-31 08:17:08 UTC
  • mfrom: (1.1.52)
  • Revision ID: package-import@ubuntu.com-20130531081708-3un9mp81xo3d6geh
Tags: 1:2013.2~b1-0ubuntu1
* New upstream release.
* debian/control: Add python-openssl as a build-depends. 
* debian/patches/fix-nosetests-path.patch: No longer needed.
* debian/rules: Temporarily disable tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
    Unit test case that establishes a mock environment within
49
49
    a testing directory (in isolation)
50
50
    """
 
51
    registry = None
51
52
 
52
53
    def setUp(self):
53
54
        super(IsolatedUnitTest, self).setUp()
60
61
                    default_store='filesystem',
61
62
                    filesystem_store_datadir=os.path.join(self.test_dir),
62
63
                    policy_file=policy_file)
63
 
        stubs.stub_out_registry_and_store_server(self.stubs, self.test_dir)
 
64
        stubs.stub_out_registry_and_store_server(self.stubs,
 
65
                                                 self.test_dir,
 
66
                                                 registry=self.registry)
64
67
        self.addCleanup(self.stubs.UnsetAll)
65
68
 
66
69
    def _copy_data_file(self, file_name, dst_dir):