[Python-modules-commits] [pyeapi] 11/12: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Sun Sep 25 15:45:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
bernat pushed a commit to branch master
in repository pyeapi.
commit 784d0c11878d9de815a788594107abcd85b881c9
Merge: 0a1e24f a9b5655
Author: Vincent Bernat <bernat at debian.org>
Date: Sun Sep 25 17:42:15 2016 +0200
merge patched into master
.coveragerc | 3 +
LICENSE | 2 +-
MANIFEST.in | 1 +
Makefile | 3 +-
PKG-INFO | 2 +-
VERSION | 2 +-
debian/.git-dpm | 6 +-
...fix-test-case-when-random-is-a-valid-VLAN.patch | 2 +-
...on-extension-is-included-in-Sphinx-since-.patch | 2 +-
docs/release-notes-0.7.0.rst | 27 ++
docs/release-notes.rst | 29 +-
pyeapi.egg-info/PKG-INFO | 2 +-
pyeapi.egg-info/SOURCES.txt | 5 +
pyeapi/__init__.py | 2 +-
pyeapi/api/mlag.py | 2 +-
pyeapi/api/ospf.py | 338 +++++++++++++++++++++
pyeapi/client.py | 40 ++-
pyeapi/eapilib.py | 2 +-
pyeapi/utils.py | 39 +--
test/fixtures/running_config.ospf | 29 ++
test/system/test_api_mlag.py | 7 +-
test/system/test_api_ospf.py | 185 +++++++++++
test/system/test_client.py | 42 ++-
test/unit/test_api_mlag.py | 4 +-
test/unit/test_api_ospf.py | 137 +++++++++
test/unit/test_client.py | 12 +
test/unit/test_utils.py | 2 +-
27 files changed, 852 insertions(+), 75 deletions(-)
diff --cc debian/.git-dpm
index 831bf9b,0000000..58daa90
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
- 000a361c6c1b6d1457de99032f9ad9fb73c8bbe6
- 000a361c6c1b6d1457de99032f9ad9fb73c8bbe6
- 4f185fa24c738f17a79431a6af0cfd5a7c0c7e9a
++a9b5655bc68c935afe0d61317ccd5bd17fc66a3f
++a9b5655bc68c935afe0d61317ccd5bd17fc66a3f
++32d585d9cdf039bde78ddb31d3f00c2d589cf96c
+32d585d9cdf039bde78ddb31d3f00c2d589cf96c
+pyeapi_0.7.0.orig.tar.gz
+4024662ccd4f2915508a0e65698209967dd4ea5b
+120412
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-tests-fix-test-case-when-random-is-a-valid-VLAN.patch
index 507d8d6,0000000..d362f59
mode 100644,000000..100644
--- a/debian/patches/0001-tests-fix-test-case-when-random-is-a-valid-VLAN.patch
+++ b/debian/patches/0001-tests-fix-test-case-when-random-is-a-valid-VLAN.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 0168a8affac6c1fc2490487121bdad3b5c4f0995 Mon Sep 17 00:00:00 2001
++From 272866776820111a8d018f2630f50a4f9a9f9bcb Mon Sep 17 00:00:00 2001
+From: Vincent Bernat <vincent at bernat.im>
+Date: Sun, 25 Sep 2016 17:37:16 +0200
+Subject: tests: 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/0002-docs-napoleon-extension-is-included-in-Sphinx-since-.patch
index d316721,0000000..af223a3
mode 100644,000000..100644
--- a/debian/patches/0002-docs-napoleon-extension-is-included-in-Sphinx-since-.patch
+++ b/debian/patches/0002-docs-napoleon-extension-is-included-in-Sphinx-since-.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 000a361c6c1b6d1457de99032f9ad9fb73c8bbe6 Mon Sep 17 00:00:00 2001
++From a9b5655bc68c935afe0d61317ccd5bd17fc66a3f Mon Sep 17 00:00:00 2001
+From: Vincent Bernat <vincent at bernat.im>
+Date: Sun, 25 Sep 2016 17:39:23 +0200
+Subject: docs: "napoleon" extension is included in Sphinx since 1.3
+
+---
+ docs/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 39f076be1525..b89bc0ba521f 100755
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -35,7 +35,7 @@ extensions = [
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.viewcode',
+ 'sphinx.ext.doctest',
+- 'sphinxcontrib.napoleon'
++ 'sphinx.ext.napoleon'
+ ]
+
+ # Add any paths that contain templates here, relative to this directory.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyeapi.git
More information about the Python-modules-commits
mailing list