[telepathy-salut/master] use errors from constants

[Guillaume Desmottes]

---
 tests/twisted/avahi/test-disabled-1-1-tubes.py     |    4 +++-
 ...ive-file-and-sender-disconnect-while-pending.py |    3 ++-
 .../avahi/test-request-invalid-dbus-tube.py        |    6 +++---
 .../avahi/test-send-file-to-unknown-contact.py     |    3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/avahi/test-disabled-1-1-tubes.py b/tests/twisted/avahi/test-disabled-1-1-tubes.py
index 6d04af3..0562cc4 100644
--- a/tests/twisted/avahi/test-disabled-1-1-tubes.py
+++ b/tests/twisted/avahi/test-disabled-1-1-tubes.py
@@ -18,6 +18,8 @@ from twisted.words.xish import xpath, domish
 from twisted.internet.protocol import Factory, Protocol, ClientCreator
 from twisted.internet import reactor
 
+import constants as cs
+
 PUBLISHED_NAME="test-tube"
 
 CHANNEL_TYPE_TUBES = "org.freedesktop.Telepathy.Channel.Type.Tubes"
@@ -64,7 +66,7 @@ def test(q, bus, conn):
         conn.RequestChannel(CHANNEL_TYPE_TUBES, HT_CONTACT, handle,
             True)
     except dbus.DBusException, e:
-        assert e.get_dbus_name() == 'org.freedesktop.Telepathy.Errors.NotImplemented'
+        assert e.get_dbus_name() == cs.NOT_IMPLEMENTED
     else:
         assert False, "Should raise NotImplemented error"
 
diff --git a/tests/twisted/avahi/test-receive-file-and-sender-disconnect-while-pending.py b/tests/twisted/avahi/test-receive-file-and-sender-disconnect-while-pending.py
index af33b72..ca6bf7d 100644
--- a/tests/twisted/avahi/test-receive-file-and-sender-disconnect-while-pending.py
+++ b/tests/twisted/avahi/test-receive-file-and-sender-disconnect-while-pending.py
@@ -3,6 +3,7 @@ import dbus
 from saluttest import exec_test
 from file_transfer_helper import ReceiveFileTest, SOCKET_ADDRESS_TYPE_UNIX,\
     SOCKET_ACCESS_CONTROL_LOCALHOST
+import constants as cs
 
 class ReceiveFileAndSenderDisconnectWhilePendingTest(ReceiveFileTest):
     def accept_file(self):
@@ -17,7 +18,7 @@ class ReceiveFileAndSenderDisconnectWhilePendingTest(ReceiveFileTest):
             self.ft_channel.AcceptFile(SOCKET_ADDRESS_TYPE_UNIX,
                 SOCKET_ACCESS_CONTROL_LOCALHOST, "", 0, byte_arrays=True)
         except dbus.DBusException, e:
-            assert e.get_dbus_name() == 'org.freedesktop.Telepathy.Errors.NotAvailable'
+            assert e.get_dbus_name() == cs.NOT_AVAILABLE
         else:
             assert False, "Should raise NotAvailable error"
 
diff --git a/tests/twisted/avahi/test-request-invalid-dbus-tube.py b/tests/twisted/avahi/test-request-invalid-dbus-tube.py
index 984ebcf..b84cc29 100644
--- a/tests/twisted/avahi/test-request-invalid-dbus-tube.py
+++ b/tests/twisted/avahi/test-request-invalid-dbus-tube.py
@@ -14,6 +14,7 @@ from servicetest import make_channel_proxy, Event, EventPattern, call_async, \
 from twisted.words.xish import xpath, domish
 from twisted.internet.protocol import Factory, Protocol, ClientCreator
 from twisted.internet import reactor
+import constants as cs
 
 print "FIXME: test-request-invalid-dbus-tube.py disabled because the new API"
 print "       for DBus tubes is not implemented."
@@ -53,9 +54,8 @@ def test(q, bus, conn):
                     invalid_service_name
                 });
         except dbus.DBusException, e:
-            assert e.get_dbus_name() == \
-                'org.freedesktop.Telepathy.Errors.InvalidArgument', \
-                (e.get_dbus_name(), invalid_service_name)
+            assert e.get_dbus_name() == cs.INVALID_ARGUMENT,\
+            (e.get_dbus_name(), invalid_service_name)
         else:
             assert False, "Should raise InvalidArgument error"
 
diff --git a/tests/twisted/avahi/test-send-file-to-unknown-contact.py b/tests/twisted/avahi/test-send-file-to-unknown-contact.py
index bb597d6..cab907c 100644
--- a/tests/twisted/avahi/test-send-file-to-unknown-contact.py
+++ b/tests/twisted/avahi/test-send-file-to-unknown-contact.py
@@ -4,6 +4,7 @@ from saluttest import exec_test
 from file_transfer_helper import SendFileTest, HT_CONTACT
 
 from avahitest import get_host_name
+import constants as cs
 
 class SendFileTransferToUnknownContactTest(SendFileTest):
     def __init__(self):
@@ -18,7 +19,7 @@ class SendFileTransferToUnknownContactTest(SendFileTest):
         try:
             self.request_ft_channel()
         except dbus.DBusException, e:
-            assert e.get_dbus_name() == 'org.freedesktop.Telepathy.Errors.NotAvailable'
+            assert e.get_dbus_name() == cs.NOT_AVAILABLE
         else:
             assert False, "Should raise NotAvailable error"
 
-- 
1.5.6.5