commit: 78b2bc8b7904db6bb967faad47981c058e90b60a Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> AuthorDate: Tue Sep 20 15:08:21 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Dec 26 16:09:02 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b2bc8b
media-libs/libmygpo-qt: fix test failure Closes: https://github.com/gentoo/gentoo/pull/2350 ...ygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch | 26 ++++++++++++++++++++++ media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild | 1 + media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild | 1 + 3 files changed, 28 insertions(+) diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch new file mode 100644 index 00000000..0d3dd76 --- /dev/null +++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch @@ -0,0 +1,26 @@ +Fix the failure of JsonCreatorTest due to mistake in expected string. +The patch is submitted to upstream: https://github.com/gpodder/libmygpo-qt/pull/10 + +From: Golubev Alexander <[email protected]> +Date: Tue, 20 Sep 2016 15:33:30 +0400 + +--- + tests/JsonCreatorTest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp +index b15b006..feb03d5 100644 +--- a/tests/JsonCreatorTest.cpp ++++ b/tests/JsonCreatorTest.cpp +@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON() + + output = JsonCreator::episodeActionListToJSON(episodeActions); + QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") ); +- QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"; },{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1 998-01-01T00:01:02\"}]" ) ); ++ QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"19 98-01-01T00:01:02\"}]" ) ); + + QCOMPARE(outString2, expected2 ); + } +-- +2.7.4 + diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild index 55d0b4a..cbe9687 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.8.ebuild @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:4 )" DOCS=( AUTHORS README ) +PATCHES=( ${FILESDIR}/${P}-fix-JsonCreatorTest-failure.patch ) src_prepare() { cmake-utils_src_prepare diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild index af69ab2..cf7ac6c 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:4 )" DOCS=( AUTHORS README ) +PATCHES=( ${FILESDIR}/${PN}-1.0.8-fix-JsonCreatorTest-failure.patch ) src_configure() { local mycmakeargs=(
