diff options
| author | Martin Pitt <martinpitt@gnome.org> | 2013-03-18 10:28:08 +0100 |
|---|---|---|
| committer | Martin Pitt <martinpitt@gnome.org> | 2013-03-18 10:28:08 +0100 |
| commit | 6ee73074971eaab23646550d1f17b9abd9725501 (patch) | |
| tree | c31b7ba22acc759ef8eaa2952798c58b798dbefc /test | |
| parent | e2e53eb30a1614369da2bcdeff22d5861c6b2613 (diff) | |
| download | gvfs-6ee73074971eaab23646550d1f17b9abd9725501.tar.gz | |
gvfs-test: Update expected gvfs-mount -li output
Update expected "Drive connected:" output for the Drive.test_cdrom and
Drive.test_system_partition tests, as gvfs now prints the driver name instead
of the label.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/gvfs-test | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/test/gvfs-test b/test/gvfs-test index 641f770c..e8b14168 100755 --- a/test/gvfs-test +++ b/test/gvfs-test @@ -957,14 +957,16 @@ class Drive(GvfsTestCase): # check that gvfs monitor picks up the new drive out = self.get_monitor_output() - self.assertRegex(out, 'Drive connected:\s+.*CD') + self.assertRegex(out, 'Drive connected:') + self.assertRegex(out, '\[drive-optical\]') + self.assertRegex(out, '\[media-optical-cd\]') self.assertRegex(out, 'unix-device:.*/dev/%s' % dev) - self.assertTrue('has_media=1' in out, out) + self.assertRegex(out, 'has_media=1') self.assertRegex(out, 'Volume added:\s+.*bogus-cd') self.assertRegex(out, "label:\s+'bogus-cd") - self.assertTrue('can_mount=1' in out, out) - self.assertTrue('should_automount=1' in out, out) + self.assertRegex(out, 'can_mount=1') + self.assertRegex(out, 'should_automount=1') self.assertRegex(out, 'themed icons:.*media-optical') # user is not on any local session in the sandbox, so mounting ought to @@ -1078,13 +1080,14 @@ class Drive(GvfsTestCase): # check that gvfs monitor picks up the new drive out = self.get_monitor_output() - self.assertRegex(out, 'Drive connected:\s+.*Disk') + self.assertRegex(out, 'Drive connected:') + self.assertRegex(out, '\[drive-harddisk\]') self.assertRegex(out, 'unix-device:.*/dev/%s' % dev) - self.assertTrue('has_media=1' in out, out) + self.assertRegex(out, 'has_media=1') self.assertRegex(out, 'Volume added:\s+.*testvfat') self.assertRegex(out, "label:\s+'testvfat") - self.assertTrue('should_automount=0' in out, out) + self.assertRegex(out, 'should_automount=0') self.assertRegex(out, 'themed icons:.*harddisk') # should fail with only allowing the user to mount removable storage |