Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 into 4.6

1 files changed, 7 insertions, 5 deletions

diff --git a/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp b/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
index 10b43b1..ac0f806 100644
--- a/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
+++ b/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
@@ -47,12 +47,13 @@ class tst_QDBusServiceWatcher: public QObject
 {
     Q_OBJECT
     QString serviceName;
+    int testCounter;
 public:
     tst_QDBusServiceWatcher();
 
 private slots:
     void initTestCase();
-    void cleanup();
+    void init();
 
     void watchForCreation();
     void watchForDisappearance();
@@ -61,7 +62,7 @@ private slots:
 };
 
 tst_QDBusServiceWatcher::tst_QDBusServiceWatcher()
-    : serviceName("com.example.TestName")
+    : testCounter(0)
 {
 }
 
@@ -71,10 +72,10 @@ void tst_QDBusServiceWatcher::initTestCase()
     QVERIFY(con.isConnected());
 }
 
-void tst_QDBusServiceWatcher::cleanup()
+void tst_QDBusServiceWatcher::init()
 {
-    // ensure that the name isn't registered
-    QDBusConnection::sessionBus().unregisterService(serviceName);
+    // change the service name from test to test
+    serviceName = "com.example.TestService" + QString::number(testCounter++);
 }
 
 void tst_QDBusServiceWatcher::watchForCreation()
@@ -135,6 +136,7 @@ void tst_QDBusServiceWatcher::watchForDisappearance()
     QVERIFY(con.isConnected());
 
     QDBusServiceWatcher watcher(serviceName, con, QDBusServiceWatcher::WatchForUnregistration);
+    watcher.setObjectName("watcher for disappearance");
 
     QSignalSpy spyR(&watcher, SIGNAL(serviceRegistered(QString)));
     QSignalSpy spyU(&watcher, SIGNAL(serviceUnregistered(QString)));