diff options
| author |   Alexander Golubev <fatzer2@gmail.com> | 2016-09-20 18:08:21 +0300 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2016-12-26 17:09:02 +0100 |
| commit | 78b2bc8b7904db6bb967faad47981c058e90b60a (patch) | |
| tree | ff8a23dba7c03ab9569b27edf13bf864fc7f65bd | |
| parent | media-sound/libmygpo: version bump 1.0.9 (diff) | |
| download | gentoo-78b2bc8b.tar.gz gentoo-78b2bc8b.tar.bz2 gentoo-78b2bc8b.zip | |
media-libs/libmygpo-qt: fix test failure
Closes: https://github.com/gentoo/gentoo/pull/2350
3 files changed, 28 insertions, 0 deletions
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 000000000000..0d3dd764d8f6 --- /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 <fatzer2@gmail.com> +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\":\"1998-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\":\"1998-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 55d0b4a7505f..cbe9687ff812 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 af69ab287371..cf7ac6c6fe1e 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=( |