← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to tests/test_misc.py

  • Committer: Colin Watson
  • Date: 2012-11-22 16:27:21 UTC
  • Revision ID: cjwatson@canonical.com-20121122162721-q1ykdeiuxy1dq38w
Huge pile of minor changes to make ubiquity compatible with pep8 1.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_misc.py
18
18
_disk_info = ('Ubuntu-Server 10.04.1 LTS _Lucid Lynx_ '
19
19
              '- Release i386 (20100816.2)')
20
20
_proc_mounts = [
21
 
'rootfs / rootfs rw 0 0',
22
 
'none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0',
23
 
'none /proc proc rw,nosuid,nodev,noexec,relatime 0 0',
24
 
'none /dev devtmpfs rw,relatime,size=503688k,nr_inodes=125922,mode=755 0 0',
25
 
'none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,'
26
 
    'ptmxmode=000 0 0',
27
 
'fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0',
28
 
'/dev/disk/by-uuid/35583897-668f-4303-80a1-aa4e7f599978 / ext4 '
29
 
    'rw,relatime,errors=remount-ro,barrier=1,data=ordered 0 0',
30
 
'none /sys/kernel/debug debugfs rw,relatime 0 0',
31
 
'none /sys/kernel/security securityfs rw,relatime 0 0',
32
 
'none /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0',
33
 
'none /var/run tmpfs rw,nosuid,relatime,mode=755 0 0',
34
 
'none /var/lock tmpfs rw,nosuid,nodev,noexec,relatime 0 0',
35
 
'binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc '
36
 
    'rw,nosuid,nodev,noexec,relatime 0 0',
37
 
'gvfs-fuse-daemon /home/evan/.gvfs fuse.gvfs-fuse-daemon '
38
 
    'rw,nosuid,nodev,relatime,user_id=1000,group_id=1000 0 0',
 
21
    'rootfs / rootfs rw 0 0',
 
22
    'none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0',
 
23
    'none /proc proc rw,nosuid,nodev,noexec,relatime 0 0',
 
24
    ('none /dev devtmpfs '
 
25
     'rw,relatime,size=503688k,nr_inodes=125922,mode=755 0 0'),
 
26
    ('none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,'
 
27
     'ptmxmode=000 0 0'),
 
28
    'fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0',
 
29
    ('/dev/disk/by-uuid/35583897-668f-4303-80a1-aa4e7f599978 / ext4 '
 
30
     'rw,relatime,errors=remount-ro,barrier=1,data=ordered 0 0'),
 
31
    'none /sys/kernel/debug debugfs rw,relatime 0 0',
 
32
    'none /sys/kernel/security securityfs rw,relatime 0 0',
 
33
    'none /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0',
 
34
    'none /var/run tmpfs rw,nosuid,relatime,mode=755 0 0',
 
35
    'none /var/lock tmpfs rw,nosuid,nodev,noexec,relatime 0 0',
 
36
    ('binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc '
 
37
     'rw,nosuid,nodev,noexec,relatime 0 0'),
 
38
    ('gvfs-fuse-daemon /home/evan/.gvfs fuse.gvfs-fuse-daemon '
 
39
     'rw,nosuid,nodev,relatime,user_id=1000,group_id=1000 0 0'),
39
40
]
40
41
 
41
42
 
154
155
        self.assertEqual(mock_execute.call_count, 1)
155
156
        self.assertEqual(mock_execute.call_args[0][0], 'setxkbmap')
156
157
        self.assertEqual(mock_set_list.call_count, 1)
157
 
        self.assertEqual(mock_set_list.call_args[0][0],
158
 
            'org.gnome.libgnomekbd.keyboard')
 
158
        self.assertEqual(
 
159
            mock_set_list.call_args[0][0], 'org.gnome.libgnomekbd.keyboard')
159
160
        self.assertEqual(mock_set_list.call_args[0][1], 'layouts')
160
161
        self.assertEqual('us', mock_set_list.call_args[0][2][0])
161
162
        self.assertEqual(len(mock_set_list.call_args[0][2]), 4)
167
168
        self.assertEqual(mock_execute.call_count, 1)
168
169
        self.assertEqual(mock_execute.call_args[0][0], 'setxkbmap')
169
170
        self.assertEqual(mock_set_list.call_count, 1)
170
 
        self.assertEqual(mock_set_list.call_args[0][0],
171
 
            'org.gnome.libgnomekbd.keyboard')
 
171
        self.assertEqual(
 
172
            mock_set_list.call_args[0][0], 'org.gnome.libgnomekbd.keyboard')
172
173
        self.assertEqual(mock_set_list.call_args[0][1], 'layouts')
173
174
        self.assertEqual('fr\toss', mock_set_list.call_args[0][2][0])
174
175
        self.assertEqual(len(mock_set_list.call_args[0][2]), 4)
180
181
        self.assertEqual(mock_execute.call_count, 1)
181
182
        self.assertEqual(mock_execute.call_args[0][0], 'setxkbmap')
182
183
        self.assertEqual(mock_set_list.call_count, 1)
183
 
        self.assertEqual(mock_set_list.call_args[0][0],
184
 
            'org.gnome.libgnomekbd.keyboard')
 
184
        self.assertEqual(
 
185
            mock_set_list.call_args[0][0], 'org.gnome.libgnomekbd.keyboard')
185
186
        self.assertEqual(mock_set_list.call_args[0][1], 'layouts')
186
187
        self.assertIn('se\tdvorak', mock_set_list.call_args[0][2])
187
188
 
188
189
    @mock.patch('ubiquity.gsettings.set_list')
189
190
    @mock.patch('ubiquity.misc.execute')
190
 
    def test_set_indicator_keymaps_ta(self, mock_execute,
191
 
                                        mock_set_list):
 
191
    def test_set_indicator_keymaps_ta(self, mock_execute, mock_set_list):
192
192
        misc.set_indicator_keymaps('ta')
193
193
        self.assertEqual(mock_execute.call_count, 1)
194
194
        self.assertEqual(mock_execute.call_args[0][0], 'setxkbmap')
195
195
        self.assertEqual(mock_set_list.call_count, 1)
196
 
        self.assertEqual(mock_set_list.call_args[0][0],
197
 
            'org.gnome.libgnomekbd.keyboard')
 
196
        self.assertEqual(
 
197
            mock_set_list.call_args[0][0], 'org.gnome.libgnomekbd.keyboard')
198
198
        self.assertEqual(mock_set_list.call_args[0][1], 'layouts')
199
199
        self.assertEqual('in\ttam', mock_set_list.call_args[0][2][0])
200
200
        self.assertEqual(len(mock_set_list.call_args[0][2]), 4)
207
207
        self.assertEqual(mock_execute.call_count, 1)
208
208
        self.assertEqual(mock_execute.call_args[0][0], 'setxkbmap')
209
209
        self.assertEqual(mock_set_list.call_count, 1)
210
 
        self.assertEqual(mock_set_list.call_args[0][0],
211
 
            'org.gnome.libgnomekbd.keyboard')
 
210
        self.assertEqual(
 
211
            mock_set_list.call_args[0][0], 'org.gnome.libgnomekbd.keyboard')
212
212
        self.assertEqual(mock_set_list.call_args[0][1], 'layouts')
213
213
        self.assertEqual('cn', mock_set_list.call_args[0][2][0])
214
214
        self.assertEqual(len(mock_set_list.call_args[0][2]), 1)
320
320
    """
321
321
 
322
322
    def setUp(self):
323
 
        for obj in (
 
323
        to_patch = (
324
324
            'os.path.realpath',
325
325
            'os.path.samefile',
326
326
            'ubiquity.misc.boot_device',
327
327
            'ubiquity.misc.cdrom_mount_info',
328
328
            'ubiquity.misc.grub_device_map',
329
329
            'ubiquity.misc.is_removable',
330
 
            ):
 
330
        )
 
331
        for obj in to_patch:
331
332
            patcher = mock.patch(obj)
332
333
            patcher.start()
333
334
            self.addCleanup(patcher.stop)
396
397
        self.devices = [
397
398
            ['hd0', 'sda', 'disk-1'],
398
399
            ['hd1', 'sdb', 'disk-2'],
399
 
            ]
 
400
        ]
400
401
        self.cdrom_mount = ('/dev/sr0', 'vfat')
401
402
        self.assertEqual('/dev/sda', misc.grub_default())
402
403
 
406
407
        self.devices = [
407
408
            ['hd0', 'sda', 'cdrom'],
408
409
            ['hd1', 'sdb', 'disk'],
409
 
            ]
 
410
        ]
410
411
        self.cdrom_mount = ('/dev/sda', 'vfat')
411
412
        self.assertEqual('/dev/sdb', misc.grub_default())
412
413
        self.cdrom_mount = ('/dev/disk/by-id/cdrom', 'vfat')
416
417
        self.devices = [
417
418
            ['hd0', 'sda', 'usb'],
418
419
            ['hd1', 'sdb', 'disk'],
419
 
            ]
 
420
        ]
420
421
        self.cdrom_mount = ('/dev/sda', 'iso9660')
421
422
        self.removable_devices = ['/dev/sda']
422
423
        self.boot_device = None
426
427
        self.devices = [
427
428
            ['hd0', 'sda', 'disk'],
428
429
            ['hd1', 'sdb', 'usb'],
429
 
            ]
 
430
        ]
430
431
        self.cdrom_mount = ('/dev/sdb', 'iso9660')
431
432
        self.removable_devices = ['/dev/sdb']
432
433
        self.boot_device = None