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

[Ondrej Novy]

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

onovy pushed a commit to branch master
in repository python-molotov.

commit db0b35464f32011c3a0ea1c025fc672210639e1f
Merge: 4f55096 1369f5c
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Feb 4 10:31:11 2018 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...able-tests-which-requires-internet-access.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 molotov/tests/test_slave.py                        |  3 ++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 9c389b3,0000000..0d904fd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- dd775394135e0c260fcf6525077e4e09094b2b0c
- dd775394135e0c260fcf6525077e4e09094b2b0c
++1369f5c515f0757bab355a670f9bcf851b0930d9
++1369f5c515f0757bab355a670f9bcf851b0930d9
 +dd775394135e0c260fcf6525077e4e09094b2b0c
 +dd775394135e0c260fcf6525077e4e09094b2b0c
 +python-molotov_1.4.orig.tar.gz
 +0ca1247b06164ad24a1b52f9c2f60509448fb807
 +34365
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Disable-tests-which-requires-internet-access.patch
index 0000000,0000000..d99a323
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Disable-tests-which-requires-internet-access.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 1369f5c515f0757bab355a670f9bcf851b0930d9 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sun, 4 Feb 2018 10:31:03 +0100
++Subject: Disable tests which requires internet access
++
++Forwarded: no
++---
++ molotov/tests/test_slave.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/molotov/tests/test_slave.py b/molotov/tests/test_slave.py
++index ee5912e..94c6965 100644
++--- a/molotov/tests/test_slave.py
+++++ b/molotov/tests/test_slave.py
++@@ -1,4 +1,5 @@
++ import os
+++import pytest
++ from molotov import __version__
++ from molotov.slave import main
++ from molotov.tests.support import TestLoop, dedicatedloop, set_args
++@@ -6,7 +7,7 @@ from molotov.tests.support import TestLoop, dedicatedloop, set_args
++ 
++ _REPO = 'https://github.com/loads/molotov'
++ 
++-
+++ at pytest.mark.skip(reason="This test requires internet access")
++ class TestSlave(TestLoop):
++     @dedicatedloop
++     def test_main(self):
diff --cc debian/patches/series
index 0000000,0000000..d800fc2
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Disable-tests-which-requires-internet-access.patch

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