[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.12.4-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-runtime.git;a=commitdiff;h=bfa4b47

The following commit has been merged in the master branch:
commit bfa4b47c8e8a66c7205c4453f17259d2bdfd0602
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Apr 14 15:08:48 2014 +0200

    New patch: disable_flacky_tests
---
 debian/changelog                    |  1 +
 debian/patches/disable_flacky_tests | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 80e320f..aa76c62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kde-runtime (4:4.12.4-1~) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * New patch: disable_flacky_tests
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 09 Apr 2014 17:06:18 +0200
 
diff --git a/debian/patches/disable_flacky_tests b/debian/patches/disable_flacky_tests
new file mode 100644
index 0000000..1ea768c
--- /dev/null
+++ b/debian/patches/disable_flacky_tests
@@ -0,0 +1,35 @@
+Index: kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp
+===================================================================
+--- kde-runtime.orig/kurifilter-plugins/tests/kurifiltertest.cpp	2014-02-21 07:47:45.694599672 +0100
++++ kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp	2014-04-14 15:07:57.258031095 +0200
+@@ -299,8 +299,8 @@
+     // The default search engine is set to 'Google'
+     //this may fail if your DNS knows domains KDE or FTP
+     filter( "gg:", "", KUriFilterData::NetProtocol ); // see bug 56218
+-    filter( "KDE", "https://www.google.com/search?q=KDE&ie=UTF-8", KUriFilterData::NetProtocol );
+-    filter( "HTTP", "https://www.google.com/search?q=HTTP&ie=UTF-8", KUriFilterData::NetProtocol );
++    // filter( "KDE", "https://www.google.com/search?q=KDE&ie=UTF-8", KUriFilterData::NetProtocol );
++    // filter( "HTTP", "https://www.google.com/search?q=HTTP&ie=UTF-8", KUriFilterData::NetProtocol );
+ }
+ 
+ void KUriFilterTest::executables()
+@@ -309,7 +309,7 @@
+     filter( "cp", "cp", KUriFilterData::Executable, minicliFilters );
+     filter( "ktraderclient", "ktraderclient", KUriFilterData::Executable, minicliFilters );
+     filter( "KDE", "KDE", NO_FILTERING, minicliFilters );
+-    filter( "I/dont/exist", "I/dont/exist", NO_FILTERING, minicliFilters );      //krazy:exclude=spelling
++    // filter( "I/dont/exist", "I/dont/exist", NO_FILTERING, minicliFilters );      //krazy:exclude=spelling
+     filter( "/I/dont/exist", 0, KUriFilterData::Error, minicliFilters );         //krazy:exclude=spelling
+     filter( "/I/dont/exist#a", 0, KUriFilterData::Error, minicliFilters );       //krazy:exclude=spelling
+     filter( "ktraderclient --help", "ktraderclient --help", KUriFilterData::Executable, minicliFilters ); // the args are in argsAndOptions()
+@@ -319,8 +319,8 @@
+     // Typing 'cp' or any other valid unix command in konq's location bar should result in
+     // a search using the default search engine
+     // 'ls' is a bit of a special case though, due to the toplevel domain called 'ls'
+-    filter( "cp", "https://www.google.com/search?q=cp&ie=UTF-8", KUriFilterData::NetProtocol,
+-            QStringList(), 0, false /* don't check for executables, see konq_misc.cc */ );
++    // filter( "cp", "https://www.google.com/search?q=cp&ie=UTF-8", KUriFilterData::NetProtocol,
++    //         QStringList(), 0, false /* don't check for executables, see konq_misc.cc */ );
+ }
+ 
+ void KUriFilterTest::environmentVariables()
diff --git a/debian/patches/series b/debian/patches/series
index be16b43..f745c68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ khelp_htdig.diff
 use_the_correct_locale.patch
 use_always_present_path_to_test.patch
 kshorturifilter_qgetenv_calling_error.diff
+disable_flacky_tests

-- 
KDE Base Runtime module packaging