[Python-modules-commits] [python-mpegdash] 05/06: merge patched into master

[Ondrej Koblizek]

This is an automated email from the git hooks/post-receive script.

kobla-guest pushed a commit to branch master
in repository python-mpegdash.

commit 76390976fd6868d2c521d9d3c7531c8f8c6f6b54
Merge: 4139e1d 1021a79
Author: Ondrej Koblizek <ondrej.koblizek at firma.seznam.cz>
Date:   Wed May 18 15:30:13 2016 +0200

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../0001-Prevent-internet-access-in-test.patch      | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 tests/test_xmltompd.py                              |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 48d1876,0000000..11f699e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 3c76510490e17c427b7f54e3d106ba2efee697a6
- 3c76510490e17c427b7f54e3d106ba2efee697a6
++1021a799524c4b3c0940e6ec4b8fa1e15ed4fa5b
++1021a799524c4b3c0940e6ec4b8fa1e15ed4fa5b
 +3c76510490e17c427b7f54e3d106ba2efee697a6
 +3c76510490e17c427b7f54e3d106ba2efee697a6
 +python-mpegdash_0.1.0.orig.tar.gz
 +c750c57c7826085338998923ac8733c9aea296f2
 +12812
diff --cc debian/patches/0001-Prevent-internet-access-in-test.patch
index 0000000,0000000..6e7c20b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Prevent-internet-access-in-test.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 1021a799524c4b3c0940e6ec4b8fa1e15ed4fa5b Mon Sep 17 00:00:00 2001
++From: Ondrej Koblizek <ondrej.koblizek at firma.seznam.cz>
++Date: Wed, 18 May 2016 15:29:38 +0200
++Subject: Prevent internet access in test
++
++---
++ tests/test_xmltompd.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/tests/test_xmltompd.py b/tests/test_xmltompd.py
++index decda3d..dc877b8 100644
++--- a/tests/test_xmltompd.py
+++++ b/tests/test_xmltompd.py
++@@ -32,6 +32,7 @@ class XML2MPDTestCase(unittest.TestCase):
++         self.assert_mpd(MPEGDASHParser.parse('./tests/mpd-samples/oops-20120802-manifest.mpd'))
++         self.assert_mpd(MPEGDASHParser.parse('./tests/mpd-samples/360p_speciment_dash.mpd'))
++ 
+++    @unittest.skip("Prevent internet access")
++     def test_xml2mpd_from_url(self):
++         mpd_url = 'http://yt-dash-mse-test.commondatastorage.googleapis.com/media/motion-20120802-manifest.mpd'
++         self.assert_mpd(MPEGDASHParser.parse(mpd_url))
diff --cc debian/patches/series
index 0000000,0000000..9f5766a
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Prevent-internet-access-in-test.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mpegdash.git