From a0a89623f6ab41d78dcb8a9602387aca6657225a Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@gnome.org>
Date: Sat, 26 Jul 2008 10:46:49 +0000
Subject: Add a new API for registering exceptions for a GError domain.
 Register a

2008-07-26  Johan Dahlin  <johan@gnome.org>

    * examples/gio/directory-async.py:
    * gio/Makefile.am:
    * gio/giomodule.c (init_gio):
    * glib/pyglib.c (pyglib_error_check),
    (pyglib_register_exception_for_domain):
    * glib/pyglib.h:
    * tests/test_gio.py:
    Add a new API for registering exceptions for a GError domain.
    Register a new exception for G_IO_ERROR, update tests
    and examples to use the new exception.


svn path=/trunk/; revision=863
---
 tests/test_gio.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/test_gio.py b/tests/test_gio.py
index 128494f..92ffb47 100644
--- a/tests/test_gio.py
+++ b/tests/test_gio.py
@@ -103,18 +103,21 @@ class TestFile(unittest.TestCase):
             try:
                 try:
                     retval = gfile.mount_enclosing_volume_finish(result)
-                except glib.GError, e:
+                except gio.Error, e:
                     # If we run the tests too fast
-                    if (e.domain == gio.ERROR and
-                        e.code == gio.ERROR_ALREADY_MOUNTED):
+                    if e.code == gio.ERROR_ALREADY_MOUNTED:
                         print ('WARNING: testfile is already mounted, '
-                               'skipping test')
+                        'skipping test')
                         loop.quit()
                         return
                     raise
                 self.failUnless(retval)
             finally:
-                mount = gfile.find_enclosing_mount()
+                try:
+                    mount = gfile.find_enclosing_mount()
+                except gio.Error:
+                    loop.quit()
+                    return
                 mount.unmount(unmount_done)
 
         mount_operation = gio.MountOperation()
@@ -239,7 +242,7 @@ class TestInputStream(unittest.TestCase):
                 self.count += 1
                 if self.count == 1:
                     return
-                self.assertRaises(glib.GError, stream.read_finish, result)
+                self.assertRaises(gio.Error, stream.read_finish, result)
             finally:
                 loop.quit()
 
@@ -311,7 +314,7 @@ class TestOutputStream(unittest.TestCase):
         def callback(stream, result):
             self.assertEquals(result.get_op_res_gssize(), 0)
             try:
-                self.assertRaises(glib.GError, stream.write_finish, result)
+                self.assertRaises(gio.Error, stream.write_finish, result)
             finally:
                 loop.quit()
 
-- 
cgit