libcontextprovider, protocol change: Updating customer tests.

2 files changed, 5 insertions, 4 deletions

diff --git a/libcontextprovider/customer-tests/client/commandwatcher.cpp b/libcontextprovider/customer-tests/client/commandwatcher.cpp
index ae656661..b5bb05b9 100644
--- a/libcontextprovider/customer-tests/client/commandwatcher.cpp
+++ b/libcontextprovider/customer-tests/client/commandwatcher.cpp
@@ -185,7 +185,7 @@ void CommandWatcher::callSubscribe(const QString& name, const QString& key)
     pc.waitForFinished();
     QDBusPendingReply<QList<QVariant>, quint64> reply = pc;
     if (reply.isError()) {
-        out << "Subscribe error: " << reply.reply().errorName() << reply.reply().errorMessage() << endl;
+        out << "Subscribe error: " << reply.reply().errorName() << endl;
         return;
     }
     out << "Subscribe returned: " << describeValue(reply.argumentAt<0>(), reply.argumentAt<1>()) << endl;
diff --git a/libcontextprovider/customer-tests/subscription/subscriptiontests.cpp b/libcontextprovider/customer-tests/subscription/subscriptiontests.cpp
index 6a3e4f0e..3f0f91c7 100644
--- a/libcontextprovider/customer-tests/subscription/subscriptiontests.cpp
+++ b/libcontextprovider/customer-tests/subscription/subscriptiontests.cpp
@@ -86,14 +86,15 @@ void SubscriptionTests::cleanup()
     }
     delete client; client = NULL;
 
-    delete service1; service1 = NULL;
-    delete service2; service2 = NULL;
-
+    // Note: we need to delete the properties before deleting the service
     delete test_int; test_int = NULL;
     delete test_double; test_double = NULL;
     delete test_bool; test_bool = NULL;
     delete test_string; test_string = NULL;
 
+    delete service1; service1 = NULL;
+    delete service2; service2 = NULL;
+
     // ServiceBackedns are deleted in a deferred way, thus we need to
     // get them deleted
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);