[Lsb-messages] /var/www/bzr/lsb/4.1/desktop-test r473: Apply patch from Denis to re-enable the QHostAddress tests and

Stew Benedict stewb at linux-foundation.org
Wed Mar 21 14:57:31 UTC 2012


------------------------------------------------------------
revno: 473
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: desktop-test
timestamp: Wed 2012-03-21 10:57:31 -0400
message:
  Apply patch from Denis to re-enable the QHostAddress tests and
  accept either format (bug 3271)
modified:
  lsb-qt/tests/qhostaddress/tst_qhostaddress.cpp
-------------- next part --------------
=== modified file 'lsb-qt/tests/qhostaddress/tst_qhostaddress.cpp'
--- a/lsb-qt/tests/qhostaddress/tst_qhostaddress.cpp	2012-02-21 20:00:15 +0000
+++ b/lsb-qt/tests/qhostaddress/tst_qhostaddress.cpp	2012-03-21 14:57:31 +0000
@@ -303,22 +303,16 @@
 #else
     QHostAddress address("fe80::2e0:4cff:fefb:662a%eth0");
     QCOMPARE(address.scopeId(), QString("eth0"));
-#if 0 // LSB bug 3271
-    QCOMPARE(address.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%eth0"));
-#endif
+    QCOMPARE(address.toString().toLower().replace(":0:0:0:","::"), QString("fe80::2e0:4cff:fefb:662a%eth0"));
 
     QHostAddress address2("fe80::2e0:4cff:fefb:662a");
     QCOMPARE(address2.scopeId(), QString());
     address2.setScopeId(QString("en0"));
-#if 0 // LSB bug 3271
-    QCOMPARE(address2.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%en0"));
-#endif
+    QCOMPARE(address2.toString().toLower().replace(":0:0:0:","::"), QString("fe80::2e0:4cff:fefb:662a%en0"));
 
     address2 = address;
     QCOMPARE(address2.scopeId(), QString("eth0"));
-#if 0 // LSB bug 3271
-    QCOMPARE(address2.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%eth0"));
-#endif
+    QCOMPARE(address2.toString().toLower().replace(":0:0:0:","::"), QString("fe80::2e0:4cff:fefb:662a%eth0"));
 #endif
 }
 



More information about the lsb-messages mailing list