Package: src:tellico
Version: 3.1.2-2
Tags: patch

Apparently there are more network related tests, I had to disable these for the Launchpad builds.

diff -Nru tellico-3.1.2/debian/changelog tellico-3.1.2/debian/changelog
--- tellico-3.1.2/debian/changelog	2018-05-26 10:54:12.000000000 +0000
+++ tellico-3.1.2/debian/changelog	2018-06-14 13:16:55.000000000 +0000
@@ -1,3 +1,9 @@
+tellico (3.1.2-2ubuntu2) cosmic; urgency=medium
+
+  * Disable more network related tests.
+
+ -- Matthias Klose <d...@ubuntu.com>  Thu, 14 Jun 2018 15:16:55 +0200
+
 tellico (3.1.2-2) unstable; urgency=medium
 
   * Try to fix the unit tests:
diff -Nru tellico-3.1.2/debian/patches/tests-no-network.diff tellico-3.1.2/debian/patches/tests-no-network.diff
--- tellico-3.1.2/debian/patches/tests-no-network.diff	2018-05-26 08:10:24.000000000 +0000
+++ tellico-3.1.2/debian/patches/tests-no-network.diff	2018-06-14 13:16:55.000000000 +0000
@@ -5,6 +5,8 @@
 Last-Updated: 2018-05-26
 Forwarded: not-needed
 
+Index: b/src/tests/tellicoreadtest.cpp
+===================================================================
 --- a/src/tests/tellicoreadtest.cpp
 +++ b/src/tests/tellicoreadtest.cpp
 @@ -258,6 +258,7 @@ void TellicoReadTest::testLocalImage() {
@@ -25,3 +27,60 @@
  }
  
  void TellicoReadTest::testXMLHandler() {
+Index: b/src/tests/imagejobtest.cpp
+===================================================================
+--- a/src/tests/imagejobtest.cpp
++++ b/src/tests/imagejobtest.cpp
+@@ -191,6 +191,7 @@ void ImageJobTest::testImageLink() {
+   QCOMPARE(img.linkOnly(), true);
+ }
+ 
++#if 0
+ void ImageJobTest::testNetworkImage() {
+   if(!networkIsAvailable()) {
+     QSKIP("This test requires network access", SkipSingle);
+@@ -262,6 +263,7 @@ void ImageJobTest::testNetworkImageInval
+   const Tellico::Data::Image& img = job->image();
+   QVERIFY(img.isNull());
+ }
++#endif
+ 
+ void ImageJobTest::testFactoryRequestLocal() {
+   QVERIFY(m_imageId.isEmpty());
+@@ -310,6 +312,7 @@ void ImageJobTest::testFactoryRequestLoc
+   QVERIFY(!Tellico::ImageFactory::self()->hasImageInfo(m_imageId));
+ }
+ 
++#if 0
+ void ImageJobTest::testFactoryRequestNetwork() {
+   if(!networkIsAvailable()) {
+     QSKIP("This test requires network access", SkipSingle);
+@@ -338,6 +341,7 @@ void ImageJobTest::testFactoryRequestNet
+   QCOMPARE(img.format(), QByteArray("png"));
+   QCOMPARE(img.linkOnly(), false);
+ }
++#endif
+ 
+ void ImageJobTest::testFactoryRequestNetworkLinkOnly() {
+   if(!networkIsAvailable()) {
+Index: b/src/tests/imagejobtest.h
+===================================================================
+--- a/src/tests/imagejobtest.h
++++ b/src/tests/imagejobtest.h
+@@ -44,12 +44,16 @@ private Q_SLOTS:
+   void testImageLoad();
+   void testImageLoadWithId();
+   void testImageLink();
++#if 0
+   void testNetworkImage();
+   void testNetworkImageLink();
+   void testNetworkImageInvalid();
++#endif
+   void testFactoryRequestLocal();
+   void testFactoryRequestLocalInvalid();
++#if 0
+   void testFactoryRequestNetwork();
++#endif
+   void testFactoryRequestNetworkLinkOnly();
+ 
+ Q_SIGNALS:

Reply via email to