[Python-modules-commits] [pyeapi] 02/12: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository pyeapi.

commit f372d5a4c773bb3fe46e31a8776fbe2da804281f
Merge: cf5369e 04fc296
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Sep 25 17:38:01 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...Fix-test-case-when-random-is-a-valid-VLAN.patch | 27 ++++++++++++++++++++++
 ...on-extension-is-included-in-Sphinx-since-.patch | 25 --------------------
 debian/patches/series                              |  2 +-
 test/unit/test_api_vlans.py                        |  2 +-
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --cc debian/.git-dpm
index 019a5f4,0000000..8b1086c
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
- 4f185fa24c738f17a79431a6af0cfd5a7c0c7e9a
- 4f185fa24c738f17a79431a6af0cfd5a7c0c7e9a
++04fc2968495498f745e861a31e7ad906e127fb03
++04fc2968495498f745e861a31e7ad906e127fb03
 +4f185fa24c738f17a79431a6af0cfd5a7c0c7e9a
 +4f185fa24c738f17a79431a6af0cfd5a7c0c7e9a
 +pyeapi_0.6.1.orig.tar.gz
 +ad91a983a9916782f20ad3e8ce0e699008f62aab
 +115787
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-test-case-when-random-is-a-valid-VLAN.patch
index 0000000,0000000..0014651
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-test-case-when-random-is-a-valid-VLAN.patch
@@@ -1,0 -1,0 +1,27 @@@
++From 04fc2968495498f745e861a31e7ad906e127fb03 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sun, 25 Sep 2016 17:37:16 +0200
++Subject: Fix test case when random is a valid VLAN
++
++A random string (like '214') can be a valid VLAN. Fix the test case such
++that the not-so-random string can never be a VLAN.
++
++Closes: #838828.
++Forwarded: https://github.com/arista-eosplus/pyeapi/pull/109
++---
++ test/unit/test_api_vlans.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/test/unit/test_api_vlans.py b/test/unit/test_api_vlans.py
++index 3849e6875374..7652ec936951 100644
++--- a/test/unit/test_api_vlans.py
+++++ b/test/unit/test_api_vlans.py
++@@ -49,7 +49,7 @@ class TestApiVlans(EapiConfigUnitTest):
++         self.config = open(get_fixture('running_config.text')).read()
++ 
++     def test_isvlan_with_string(self):
++-        self.assertFalse(pyeapi.api.vlans.isvlan(random_string()))
+++        self.assertFalse(pyeapi.api.vlans.isvlan('a' + random_string()))
++ 
++     def test_isvlan_valid_value(self):
++         self.assertTrue(pyeapi.api.vlans.isvlan('1234'))
diff --cc debian/patches/series
index ff4262c,0000000..7b8b308
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001-docs-napoleon-extension-is-included-in-Sphinx-since-.patch
++0001-Fix-test-case-when-random-is-a-valid-VLAN.patch

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