[SCM] kdeconnect packaging branch, master, updated. upstream/0.8-60-g875781a

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=6cd48b1

The following commit has been merged in the master branch:
commit 6cd48b188eaeeb4b1512ed9976c7e8307f4f74e6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Feb 4 23:44:48 2016 -0300

    Revert "Disable NetworkPackageTests::networkPackageIdentityTest"
    
    This reverts commit 6ac36a9d5bd945a4f052c6bf4658f64bfc6553d2.
    
    I wrongly committed stuff.
---
 debian/changelog              |  2 --
 tests/networkpackagetests.cpp | 18 +++++++++---------
 tests/networkpackagetests.h   |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dbc721..b72fdf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,6 @@ kdeconnect (0.9g-1) UNRELEASED; urgency=medium
       names from your packaging.
     - Remove unnecesary removals in debian/rules.
   * Update README.md installation.
-  * Disable NetworkPackageTests::networkPackageIdentityTest as it seems to
-    require network access.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 01 Feb 2016 17:49:26 -0300
 
diff --git a/tests/networkpackagetests.cpp b/tests/networkpackagetests.cpp
index 8ac30f4..d7079b4 100644
--- a/tests/networkpackagetests.cpp
+++ b/tests/networkpackagetests.cpp
@@ -79,15 +79,15 @@ void NetworkPackageTests::networkPackageTest()
 
 }
 
-//void NetworkPackageTests::networkPackageIdentityTest()
-//{
-//    NetworkPackage np("");
-//    NetworkPackage::createIdentityPackage(&np);
-//
-//    QCOMPARE( np.get<int>("protocolVersion") , NetworkPackage::ProtocolVersion );
-//    QCOMPARE( np.type() , PACKAGE_TYPE_IDENTITY );
-//
-//}
+void NetworkPackageTests::networkPackageIdentityTest()
+{
+    NetworkPackage np("");
+    NetworkPackage::createIdentityPackage(&np);
+
+    QCOMPARE( np.get<int>("protocolVersion") , NetworkPackage::ProtocolVersion );
+    QCOMPARE( np.type() , PACKAGE_TYPE_IDENTITY );
+
+}
 
 void NetworkPackageTests::networkPackageEncryptionTest()
 {
diff --git a/tests/networkpackagetests.h b/tests/networkpackagetests.h
index 07bfd6a..bb2b743 100644
--- a/tests/networkpackagetests.h
+++ b/tests/networkpackagetests.h
@@ -32,7 +32,7 @@ private Q_SLOTS:
 
     void dummyTest();
     void networkPackageTest();
-    //void networkPackageIdentityTest();
+    void networkPackageIdentityTest();
     void networkPackageEncryptionTest();
 
     void cleanupTestCase();

-- 
kdeconnect packaging