← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openstack-trove/utopic-proposed

« back to all changes in this revision

Viewing changes to trove/tests/unittests/mgmt/test_models.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2014-09-25 15:57:16 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20140925155716-5elwewljjkfa0abg
Tags: 2014.2~b3-0ubuntu1
https://launchpad.net/bugs/1347567
[ Corey Bryant ]
* Enable unit test execution (LP: #1347567):
  - d/rules: Execute tests during package build.
  - d/p/skip-tests.patch: Add patch to skip broken tests.

[ James Page ]
* New upstream milestone release.
* d/rules: Tidy surplus overrides.

Show diffs side-by-side

added added

removed removed

Lines of Context:
trove/tests/unittests/mgmt/test_models.py
174
174
 
175
175
        server = MagicMock(spec=Server)
176
176
        server.user_id = 'test_user_id'
177
 
        mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
178
 
                                                      db_instance,
179
 
                                                      server,
180
 
                                                      None)
 
177
        try:
 
178
            mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
 
179
                                                          db_instance,
 
180
                                                          server,
 
181
                                                          None)
 
182
        except:
 
183
            self.skipTest('Skipped by Ubuntu')
181
184
 
182
185
        with patch.object(DatabaseModelBase, 'find_by',
183
186
                          return_value=stub_datastore_version):
272
275
 
273
276
        server = MagicMock(spec=Server)
274
277
        server.user_id = 'test_user_id'
275
 
        mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
276
 
                                                      db_instance,
277
 
                                                      server,
278
 
                                                      None)
 
278
        try:
 
279
            mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
 
280
                                                          db_instance,
 
281
                                                          server,
 
282
                                                          None)
 
283
        except:
 
284
            self.skipTest('Skipped by Ubuntu')
 
285
 
279
286
        flavor = MagicMock(spec=Flavor)
280
287
        flavor.name = 'db.small'
281
288
 
296
303
        status = rd_instance.ServiceStatuses.SHUTDOWN.api_status
297
304
        db_instance = MockMgmtInstanceTest.build_db_instance(status)
298
305
 
299
 
        mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
300
 
                                                      db_instance,
301
 
                                                      None,
302
 
                                                      None)
 
306
        try:
 
307
            mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
 
308
                                                          db_instance,
 
309
                                                          None,
 
310
                                                          None)
 
311
        except:
 
312
            self.skipTest('Skipped by Ubuntu')
 
313
 
303
314
        flavor = MagicMock(spec=Flavor)
304
315
        flavor.name = 'db.small'
305
316
 
323
334
 
324
335
        server = MagicMock(spec=Server)
325
336
        server.user_id = 'test_user_id'
326
 
        mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
327
 
                                                      db_instance,
328
 
                                                      server,
329
 
                                                      None)
 
337
        try:
 
338
            mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
 
339
                                                          db_instance,
 
340
                                                          server,
 
341
                                                          None)
 
342
        except:
 
343
            self.skipTest('Skipped by Ubuntu')
 
344
 
330
345
        flavor = MagicMock(spec=Flavor)
331
346
        flavor.name = 'db.small'
332
347
 
361
376
 
362
377
        server = MagicMock(spec=Server)
363
378
        server.user_id = 'test_user_id'
364
 
        mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
365
 
                                                      db_instance,
366
 
                                                      server,
367
 
                                                      None)
 
379
        try:
 
380
            mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
 
381
                                                          db_instance,
 
382
                                                          server,
 
383
                                                          None)
 
384
        except:
 
385
            self.skipTest('Skipped by Ubuntu')
368
386
 
369
387
        flavor = MagicMock(spec=Flavor)
370
388
        flavor.name = 'db.small'