From cfb9ed72526648ed19db974a1fae6fd7339df433 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 31 Oct 2013 10:12:58 +0100 Subject: move manager files to telepathy-1 --- tests/twisted/Makefile.am | 6 +-- tests/twisted/run-test.sh.in | 2 +- tests/twisted/telepathy-1/managers/README | 4 ++ tests/twisted/telepathy-1/managers/fakecm.manager | 17 ++++++++ .../telepathy-1/managers/onewitheverything.manager | 48 ++++++++++++++++++++++ tests/twisted/telepathy/managers/README | 4 -- tests/twisted/telepathy/managers/fakecm.manager | 17 -------- .../telepathy/managers/onewitheverything.manager | 48 ---------------------- 8 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 tests/twisted/telepathy-1/managers/README create mode 100644 tests/twisted/telepathy-1/managers/fakecm.manager create mode 100644 tests/twisted/telepathy-1/managers/onewitheverything.manager delete mode 100644 tests/twisted/telepathy/managers/README delete mode 100644 tests/twisted/telepathy/managers/fakecm.manager delete mode 100644 tests/twisted/telepathy/managers/onewitheverything.manager diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index e74f5ade..7f1651f8 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -107,9 +107,9 @@ TWISTED_OTHER_FILES = \ telepathy-1/clients/README \ telepathy-1/clients/AbiWord.client \ telepathy-1/clients/Logger.client \ - telepathy/managers/fakecm.manager \ - telepathy/managers/onewitheverything.manager \ - telepathy/managers/README \ + telepathy-1/managers/fakecm.manager \ + telepathy-1/managers/onewitheverything.manager \ + telepathy-1/managers/README \ $(NULL) # This deliberately doesn't include the TWISTED_SPECIAL_BUILD_TESTS diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in index 756628b6..8b06c712 100644 --- a/tests/twisted/run-test.sh.in +++ b/tests/twisted/run-test.sh.in @@ -73,7 +73,7 @@ export XDG_CONFIG_DIRS MC_CLIENTS_DIR="${test_src}/twisted/telepathy-1/clients" export MC_CLIENTS_DIR -MC_MANAGER_DIR="${test_src}/twisted/telepathy/managers" +MC_MANAGER_DIR="${test_src}/twisted/telepathy-1/managers" export MC_MANAGER_DIR if [ -n "$1" ] ; then diff --git a/tests/twisted/telepathy-1/managers/README b/tests/twisted/telepathy-1/managers/README new file mode 100644 index 00000000..d77437cb --- /dev/null +++ b/tests/twisted/telepathy-1/managers/README @@ -0,0 +1,4 @@ +This directory contains .manager files used by Mission Control when it is run +by twisted test. $MC_MANAGER_DIR is set to this directory in the twisted +environment. + diff --git a/tests/twisted/telepathy-1/managers/fakecm.manager b/tests/twisted/telepathy-1/managers/fakecm.manager new file mode 100644 index 00000000..e0e63d5d --- /dev/null +++ b/tests/twisted/telepathy-1/managers/fakecm.manager @@ -0,0 +1,17 @@ +[ConnectionManager] +BusName=com.example.FakeCM +ObjectPath=/com/example/FakeCM/ConnectionManager + +[Protocol fakeprotocol] +param-account=s register required +param-password=s register required secret +param-nickname=s register +param-register=b +param-com.example.Badgerable.Badgered=b dbus-property +param-secret-mushroom=s +param-snakes=u +param-contrived-example=u +default-register=0 +default-com.example.Badgerable.Badgered=0 +default-com.example.Badgerable.Episode=5 +default-contrived-example=5 diff --git a/tests/twisted/telepathy-1/managers/onewitheverything.manager b/tests/twisted/telepathy-1/managers/onewitheverything.manager new file mode 100644 index 00000000..222daddb --- /dev/null +++ b/tests/twisted/telepathy-1/managers/onewitheverything.manager @@ -0,0 +1,48 @@ +[Protocol serializable] +# All the types for which telepathy-spec defines a serialization +param-s=s required +param-o=o +param-b=b +param-q=q +param-u=u +param-t=t +param-n=n +param-i=i +param-x=x +param-d=d +param-as=as +param-y=y + +[Protocol defaults] +# All the types, plus a default for each +param-s=s +default-s=foo +param-o=o +default-o=/foo +param-b=b +default-b=true +param-q=q +default-q=1 +param-u=u +default-u=1 +param-t=t +default-t=1 +param-n=n +default-n=-1 +param-i=i +default-i=-1 +param-x=x +default-x=-1 +param-d=d +default-d=1.5 +param-as=as +default-as=foo;bar;baz; +param-y=y +default-y=1 + +[Protocol flags] +# All the flags +param-account=s required register +param-name=s register +param-key=s required register secret +param-com.example.Badgerable.Badgers=s dbus-property diff --git a/tests/twisted/telepathy/managers/README b/tests/twisted/telepathy/managers/README deleted file mode 100644 index d77437cb..00000000 --- a/tests/twisted/telepathy/managers/README +++ /dev/null @@ -1,4 +0,0 @@ -This directory contains .manager files used by Mission Control when it is run -by twisted test. $MC_MANAGER_DIR is set to this directory in the twisted -environment. - diff --git a/tests/twisted/telepathy/managers/fakecm.manager b/tests/twisted/telepathy/managers/fakecm.manager deleted file mode 100644 index e0e63d5d..00000000 --- a/tests/twisted/telepathy/managers/fakecm.manager +++ /dev/null @@ -1,17 +0,0 @@ -[ConnectionManager] -BusName=com.example.FakeCM -ObjectPath=/com/example/FakeCM/ConnectionManager - -[Protocol fakeprotocol] -param-account=s register required -param-password=s register required secret -param-nickname=s register -param-register=b -param-com.example.Badgerable.Badgered=b dbus-property -param-secret-mushroom=s -param-snakes=u -param-contrived-example=u -default-register=0 -default-com.example.Badgerable.Badgered=0 -default-com.example.Badgerable.Episode=5 -default-contrived-example=5 diff --git a/tests/twisted/telepathy/managers/onewitheverything.manager b/tests/twisted/telepathy/managers/onewitheverything.manager deleted file mode 100644 index 222daddb..00000000 --- a/tests/twisted/telepathy/managers/onewitheverything.manager +++ /dev/null @@ -1,48 +0,0 @@ -[Protocol serializable] -# All the types for which telepathy-spec defines a serialization -param-s=s required -param-o=o -param-b=b -param-q=q -param-u=u -param-t=t -param-n=n -param-i=i -param-x=x -param-d=d -param-as=as -param-y=y - -[Protocol defaults] -# All the types, plus a default for each -param-s=s -default-s=foo -param-o=o -default-o=/foo -param-b=b -default-b=true -param-q=q -default-q=1 -param-u=u -default-u=1 -param-t=t -default-t=1 -param-n=n -default-n=-1 -param-i=i -default-i=-1 -param-x=x -default-x=-1 -param-d=d -default-d=1.5 -param-as=as -default-as=foo;bar;baz; -param-y=y -default-y=1 - -[Protocol flags] -# All the flags -param-account=s required register -param-name=s register -param-key=s required register secret -param-com.example.Badgerable.Badgers=s dbus-property -- cgit v1.2.3