← Back to branch summary

~nataliabidart/ubuntuone-client/unify-signal-broadcaster

« back to all changes in this revision

Viewing changes to tests/platform/linux/test_vm.py

  • Committer: Tarmac
  • Author(s): Manuel de la Pena
  • Date: 2011-10-27 13:04:14 UTC
  • mfrom: (1151.1.1 fix-tests)
  • Revision ID: tarmac-20111027130414-pdzu1410re8y3t3i
Use setUp and tearDown correctly with twisted.trial.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/platform/linux/test_vm.py
19
19
import os
20
20
import uuid
21
21
 
 
22
from twisted.internet import defer
 
23
 
22
24
from contrib.testing.testcase import FakeMain, environ
23
25
from tests.syncdaemon.test_vm import MetadataTestCase, BaseVolumeManagerTests
24
26
from ubuntuone.storageprotocol import request
44
46
class MetadataOldLayoutTests(MetadataTestCase):
45
47
    """Tests for 'old' layouts and metadata upgrade"""
46
48
 
 
49
    @defer.inlineCallbacks
47
50
    def setUp(self):
48
 
        MetadataTestCase.setUp(self)
 
51
        yield super(MetadataOldLayoutTests, self).setUp()
49
52
        self.root_dir = os.path.join(self.u1_dir, 'My Files')
50
53
        self.shares_dir = os.path.join(self.u1_dir, 'Shared With Me')
51
54
        self.new_root_dir = self.u1_dir
451
454
class MetadataNewLayoutTests(MetadataTestCase):
452
455
    """Test for 'new' layout and metadata upgrade."""
453
456
 
 
457
    @defer.inlineCallbacks
454
458
    def setUp(self):
455
 
        MetadataTestCase.setUp(self)
 
459
        yield super(MetadataNewLayoutTests, self).setUp()
456
460
        self.share_md_dir = os.path.join(self.vm_data_dir, 'shares')
457
461
        self.shared_md_dir = os.path.join(self.vm_data_dir, 'shared')
458
462
        self.home_dir = os.path.join(self.tmpdir, 'home', 'ubuntuonehacker')