summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDavid Laban <david.laban@collabora.co.uk>2011-02-12 10:03:25 +0000
committerDavid Laban <david.laban@collabora.co.uk>2011-02-12 11:02:57 +0000
commit8dcddb61752cfa140df30c94b54bd02684419323 (patch)
tree5ba95bbfdafdfd8152d783c180bfd8c49499fd7e /tests
parentada52bcb3064a5a7fa0e75038f4365b45376518c (diff)
Rename project to telepathy-rakia
For the curious, these are the commands you need: git clean -d git mv tpsip-extensions extensions git mv tpsip rakia sed -i \ -e 's/libtpsip-extensions.la/librakia-extensions.la/g' \ -e 's/libtpsip_extensions_la/librakia_extensions_la/g' \ -e 's/tpsip-extensions/extensions/g' \ -e 's/sofiasip/rakia/g' \ -e 's/tpsip/rakia/g' \ -e 's/Tpsip/Rakia/g' \ -e 's/SOFIASIP/RAKIA/g' \ */*.[ch] .gitignore configure.ac $(find -name 'Makefile.am' ; find -name '*.py' ; find -name '*.in') git mv ./docs/telepathy-sofiasip.8.in ./docs/telepathy-rakia.8.in git mv ./src/telepathy-sofiasip.c ./src/telepathy-rakia.c git mv ./data/org.freedesktop.Telepathy.ConnectionManager.sofiasip.service.in \ ./data/org.freedesktop.Telepathy.ConnectionManager.rakia.service.in git mv ./tests/twisted/tools/sofiasip.service.in \ ./tests/twisted/tools/rakia.service.in ./autogen.sh && make distcheck
Diffstat (limited to 'tests')
-rw-r--r--tests/tp_caller.c8
-rw-r--r--tests/twisted/Makefile.am4
-rw-r--r--tests/twisted/cm/protocol.py6
-rw-r--r--tests/twisted/sofiatest.py2
-rw-r--r--tests/twisted/tools/Makefile.am6
-rw-r--r--tests/twisted/tools/exec-with-log.sh.in8
-rw-r--r--tests/twisted/tools/rakia.service.in (renamed from tests/twisted/tools/sofiasip.service.in)2
-rw-r--r--tests/twisted/voip/voip_test.py2
8 files changed, 19 insertions, 19 deletions
diff --git a/tests/tp_caller.c b/tests/tp_caller.c
index 8ded84f..d1404e0 100644
--- a/tests/tp_caller.c
+++ b/tests/tp_caller.c
@@ -1,5 +1,5 @@
/*
- * tp_test.c - telepathy-sofiasip test utility (modified from
+ * tp_test.c - telepathy-rakia test utility (modified from
* libtelepathy's proto.c)
*
* Copyright (C) 2005-2006 Nokia Corporation.
@@ -45,9 +45,9 @@
/*
* Test connection manager and account
*/
-#define CONNMGR_NAME "sofiasip"
-#define CONNMGR_BUS "org.freedesktop.Telepathy.ConnectionManager.sofiasip"
-#define CONNMGR_PATH "/org/freedesktop/Telepathy/ConnectionManager/sofiasip"
+#define CONNMGR_NAME "rakia"
+#define CONNMGR_BUS "org.freedesktop.Telepathy.ConnectionManager.rakia"
+#define CONNMGR_PATH "/org/freedesktop/Telepathy/ConnectionManager/rakia"
#define PROTOCOL "sip"
enum {
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index e1d03b3..e8528a4 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -24,7 +24,7 @@ CHECK_TWISTED_SLEEP=0
check-twisted:
$(MAKE) -C tools
- rm -f tools/sofiasip-testing.log
+ rm -f tools/rakia-testing.log
sh $(srcdir)/tools/with-session-bus.sh \
--config-file=tools/tmp-session-bus.conf \
--sleep=$(CHECK_TWISTED_SLEEP) \
@@ -40,7 +40,7 @@ EXTRA_DIST = \
servicetest.py \
voip/voip_test.py
-CLEANFILES = sofiasip-[1-9]*.log *.pyc */*.pyc
+CLEANFILES = rakia-[1-9]*.log *.pyc */*.pyc
check_misc_sources = $(TESTS)
diff --git a/tests/twisted/cm/protocol.py b/tests/twisted/cm/protocol.py
index f0b0c40..f909f5f 100644
--- a/tests/twisted/cm/protocol.py
+++ b/tests/twisted/cm/protocol.py
@@ -1,5 +1,5 @@
"""
-Test tpsip's o.fd.T.Protocol implementation
+Test rakia's o.fd.T.Protocol implementation
"""
import dbus
@@ -9,8 +9,8 @@ from sofiatest import exec_test
import constants as cs
def test(q, bus, conn, sip):
- cm = bus.get_object(cs.CM + '.sofiasip',
- tp_path_prefix + '/ConnectionManager/sofiasip')
+ cm = bus.get_object(cs.CM + '.rakia',
+ tp_path_prefix + '/ConnectionManager/rakia')
cm_iface = dbus.Interface(cm, cs.CM)
cm_prop_iface = dbus.Interface(cm, cs.PROPERTIES_IFACE)
diff --git a/tests/twisted/sofiatest.py b/tests/twisted/sofiatest.py
index 23142b9..efed1e5 100644
--- a/tests/twisted/sofiatest.py
+++ b/tests/twisted/sofiatest.py
@@ -70,7 +70,7 @@ def prepare_test(event_func, register_cb, params=None):
bus = dbus.SessionBus()
conn = servicetest.make_connection(bus, event_func,
- 'sofiasip', 'sip', actual_params)
+ 'rakia', 'sip', actual_params)
port = int(actual_params['port'])
sip = SipProxy(host=actual_params['proxy-host'], port=port)
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index 1cb67b5..bd65dbd 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -12,8 +12,8 @@ org.freedesktop.Telepathy.ConnectionManager.%.service: %.service.in
sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
# D-Bus service file for testing
-service_in_files = sofiasip.service.in
-service_files = org.freedesktop.Telepathy.ConnectionManager.sofiasip.service
+service_in_files = rakia.service.in
+service_files = org.freedesktop.Telepathy.ConnectionManager.rakia.service
# D-Bus config file for testing
conf_in_files = tmp-session-bus.conf.in
@@ -29,4 +29,4 @@ EXTRA_DIST = \
CLEANFILES = \
$(BUILT_SOURCES) \
- sofiasip-testing.log
+ rakia-testing.log
diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in
index 31f0474..1eb6c7d 100644
--- a/tests/twisted/tools/exec-with-log.sh.in
+++ b/tests/twisted/tools/exec-with-log.sh.in
@@ -5,12 +5,12 @@ cd "@abs_top_builddir@/tests/twisted/tools"
export TPSIP_DEBUG=all
export TPORT_LOG=1
ulimit -c unlimited
-exec > sofiasip-testing.log 2>&1
+exec > rakia-testing.log 2>&1
-if test -n "$SOFIASIP_TEST_VALGRIND"; then
+if test -n "$RAKIA_TEST_VALGRIND"; then
export G_DEBUG=gc-friendly
export G_SLICE=always-malloc
- SOFIASIP_WRAPPER="valgrind --leak-check=full"
+ RAKIA_WRAPPER="valgrind --leak-check=full"
fi
-exec $SOFIASIP_WRAPPER @abs_top_builddir@/src/telepathy-sofiasip
+exec $RAKIA_WRAPPER @abs_top_builddir@/src/telepathy-rakia
diff --git a/tests/twisted/tools/sofiasip.service.in b/tests/twisted/tools/rakia.service.in
index 2f9fbb9..f4b324c 100644
--- a/tests/twisted/tools/sofiasip.service.in
+++ b/tests/twisted/tools/rakia.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.freedesktop.Telepathy.ConnectionManager.sofiasip
+Name=org.freedesktop.Telepathy.ConnectionManager.rakia
Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh
diff --git a/tests/twisted/voip/voip_test.py b/tests/twisted/voip/voip_test.py
index 7a28d16..b31928f 100644
--- a/tests/twisted/voip/voip_test.py
+++ b/tests/twisted/voip/voip_test.py
@@ -152,7 +152,7 @@ class VoipTestContext(object):
def accept(self, invite_message):
self.call_id = invite_message.headers['call-id'][0]
response = self.sip_proxy.responseFromRequest(200, invite_message)
- # Echo sofiasip's SDP back to it. It doesn't care.
+ # Echo rakia's SDP back to it. It doesn't care.
response.addHeader('content-type', 'application/sdp')
response.body = invite_message.body
response.addHeader('content-length', '%d' % len(response.body))