Change in vdsm[master]: py3: make network/conf_test pass

[Dan Kenigsberg]

Dan Kenigsberg has uploaded a new change for review.

Change subject: py3: make network/conf_test pass
......................................................................

py3: make network/conf_test pass

re.sub should not mix strings and byte arrays.

Change-Id: Idcab2d6f1f88b04d849156915a111189c4cc8589
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M tests/Makefile.am
M tests/network/conf_test.py
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/64928/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 132be62..fb3d7c3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -191,7 +191,6 @@
 	momTests.py \
 	monkeypatchTests.py \
 	mountTests.py \
-	network/conf_test.py \
 	network/hook_ovs_test.py \
 	network/iproute2_test.py \
 	network/ipwrapper_test.py \
diff --git a/tests/network/conf_test.py b/tests/network/conf_test.py
index d94b5e6..c230a3c 100644
--- a/tests/network/conf_test.py
+++ b/tests/network/conf_test.py
@@ -73,8 +73,8 @@
         aXml = ET.tostring(ET.fromstring(a))
         bXml = ET.tostring(ET.fromstring(b))
 
-        aXmlNrml = re.sub('>\s*\n\s*<', '><', aXml).strip()
-        bXmlNrml = re.sub('>\s*\n\s*<', '><', bXml).strip()
+        aXmlNrml = re.sub(b'>\s*\n\s*<', b'><',
aXml).strip()
+        bXmlNrml = re.sub(b'>\s*\n\s*<', b'><',
bXml).strip()
 
         self.assertEqual(aXmlNrml, bXmlNrml, msg)
 


-- 
To view, visit https://gerrit.ovirt.org/64928
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcab2d6f1f88b04d849156915a111189c4cc8589
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

gerrit-hooks has posted comments on this change.

Change subject: py3: make network/conf_test pass
......................................................................


Patch Set 1:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE,         Not in stable branch (['ovirt-3.6',
'ovirt-4.0'])

-- 
To view, visit https://gerrit.ovirt.org/64928
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idcab2d6f1f88b04d849156915a111189c4cc8589
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: py3: make network/conf_test pass
......................................................................


Patch Set 1: Verified+1

still passes, on both py2 and py3

-- 
To view, visit https://gerrit.ovirt.org/64928
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idcab2d6f1f88b04d849156915a111189c4cc8589
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Leon Goldberg <leon.otium(a)gmail.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: py3: make network/conf_test pass
......................................................................


Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/64928
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idcab2d6f1f88b04d849156915a111189c4cc8589
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Leon Goldberg <leon.otium(a)gmail.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: py3: make network/conf_test pass
......................................................................


py3: make network/conf_test pass

re.sub should not mix strings and byte arrays.

Change-Id: Idcab2d6f1f88b04d849156915a111189c4cc8589
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Reviewed-on: https://gerrit.ovirt.org/64928
Continuous-Integration: Jenkins CI
Reviewed-by: Leon Goldberg <leon.otium(a)gmail.com&gt;
---
M tests/Makefile.am
M tests/network/conf_test.py
2 files changed, 2 insertions(+), 3 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Verified; Looks good to me, approved
  Leon Goldberg: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/64928
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idcab2d6f1f88b04d849156915a111189c4cc8589
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Leon Goldberg <leon.otium(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;

gerrit-hooks has posted comments on this change.

Change subject: py3: make network/conf_test pass
......................................................................


Patch Set 2:

* Update tracker: IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.

-- 
To view, visit https://gerrit.ovirt.org/64928
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idcab2d6f1f88b04d849156915a111189c4cc8589
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Leon Goldberg <leon.otium(a)gmail.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No