[Debian-ha-commits] [pcs] 02/03: Update pcs testsuite for python-lxml 3.7.1-1

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository pcs.

commit 3f13fdaf37898786633c773517eb9e79d1b10117
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Jan 6 10:50:01 2017 +0100

    Update pcs testsuite for python-lxml 3.7.1-1
---
 debian/patches/0011-Fix-python-lxml.patch | 60 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 61 insertions(+)

diff --git a/debian/patches/0011-Fix-python-lxml.patch b/debian/patches/0011-Fix-python-lxml.patch
new file mode 100644
index 0000000..993c757
--- /dev/null
+++ b/debian/patches/0011-Fix-python-lxml.patch
@@ -0,0 +1,60 @@
+Description: Update pcs testsuite for python-lxml 3.7.1-1
+ New lxml version has changed the error messages a bit so
+ some of the pcs tests started failing because of that.
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Last-Update: 2017-01-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/pcs/lib/commands/test/test_resource_agent.py
++++ b/pcs/lib/commands/test/test_resource_agent.py
+@@ -353,7 +353,7 @@
+                 report_codes.UNABLE_TO_GET_AGENT_METADATA,
+                 {
+                     "agent": "ocf:test:Dummy",
+-                    "reason": "Start tag expected, '<' not found, line 1, column 1",
++                    "reason": "Start tag expected, '<' not found, line 1, column 1 (line 1)",
+                 }
+             )
+         )
+--- a/pcs/lib/commands/test/test_stonith_agent.py
++++ b/pcs/lib/commands/test/test_stonith_agent.py
+@@ -204,7 +204,7 @@
+                 report_codes.UNABLE_TO_GET_AGENT_METADATA,
+                 {
+                     "agent": "fence_dummy",
+-                    "reason": "Start tag expected, '<' not found, line 1, column 1",
++                    "reason": "Start tag expected, '<' not found, line 1, column 1 (line 1)",
+                 }
+             )
+         )
+--- a/pcs/lib/test/test_resource_agent.py
++++ b/pcs/lib/test/test_resource_agent.py
+@@ -1069,7 +1069,7 @@
+             self.agent._get_metadata,
+             {
+                 "agent": "stonithd",
+-                "message": "Start tag expected, '<' not found, line 1, column 1",
++                "message": "Start tag expected, '<' not found, line 1, column 1 (line 1)",
+             }
+         )
+ 
+@@ -1196,7 +1196,7 @@
+             self.agent._get_metadata,
+             {
+                 "agent": self.agent_name,
+-                "message": "Start tag expected, '<' not found, line 1, column 1",
++                "message": "Start tag expected, '<' not found, line 1, column 1 (line 1)",
+             }
+         )
+ 
+--- a/pcs/test/test_lib_cib_tools.py
++++ b/pcs/test/test_lib_cib_tools.py
+@@ -488,7 +488,7 @@
+                 report_codes.CIB_UPGRADE_FAILED,
+                 {
+                     "reason":
+-                        "Start tag expected, '<' not found, line 1, column 1",
++                        "Start tag expected, '<' not found, line 1, column 1 (line 1)",
+                 }
+             )
+         )
diff --git a/debian/patches/series b/debian/patches/series
index 4791a47..c11d762 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-Fix-cluster-destroy-cleanup.patch
 0009-Fix-testsuite.patch
 0010-Replace-chkconfig.patch
+0011-Fix-python-lxml.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git