Change in vdsm[master]: schema: Fix asserts that had side effect

[Nir Soffer]

Nir Soffer has uploaded a new change for review.

Change subject: schema: Fix asserts that had side effect
......................................................................

schema: Fix asserts that had side effect

Asserts should never have side effects, so optimizing them out will not
change the semantics of the code. Running with optimization would break
parsing, eliminating line.pop(0) operations. Now the only difference is
the warning if the line is not empty.

Change-Id: I59dbb1c8d3760af7d3f3049227f6ad8ceeaa402a
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
M vdsm/rpc/process-schema.py
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/34362/1

diff --git a/vdsm/rpc/process-schema.py b/vdsm/rpc/process-schema.py
index 4b1c3cf..8e56a1a 100755
--- a/vdsm/rpc/process-schema.py
+++ b/vdsm/rpc/process-schema.py
@@ -103,7 +103,8 @@
                    'xxx': []})
 
     # Pop a blank line
-    assert('' == lines.pop(0))
+    line = lines.pop(0)
+    assert line == '', "Expected empty line: %r" % line
 
     # Grab the entity description.  It might span multiple lines.
     symbol['desc'] = lines.pop(0)
@@ -111,7 +112,8 @@
         symbol['desc'] += lines.pop(0)
 
     # Pop a blank line
-    assert ('' == lines.pop(0))
+    line = lines.pop(0)
+    assert line == '', "Expected empty line: %r" % line
 
     # Populate the rest of the human-readable data.
     # First try to read the parameters/members information.  We are finished


-- 
To view, visit http://gerrit.ovirt.org/34362
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59dbb1c8d3760af7d3f3049227f6ad8ceeaa402a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: schema: Fix asserts that had side effect
......................................................................


Patch Set 1:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13071/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12913/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/12123/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/34362
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I59dbb1c8d3760af7d3f3049227f6ad8ceeaa402a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt;
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: schema: Fix asserts that had side effect
......................................................................


Patch Set 1:

ping?

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I59dbb1c8d3760af7d3f3049227f6ad8ceeaa402a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: Fix asserts that had side effect
......................................................................


Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I59dbb1c8d3760af7d3f3049227f6ad8ceeaa402a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No