Change in vdsm[master]: restTests: use short release/version

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: restTests: use short release/version
......................................................................

restTests: use short release/version

oVirt Engine cannot handle release/version with more then 2 digits.
To workaround, we add a sed command into vdsm.spec to make version/release
a short string in dsaversion.py. However, restTests is failing now because
the version/release provided by dsaversion are not releated to the
full version string provided by REST API. This patch will add a workaround
also in restTests.py

Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Signed-off-by: Douglas Schilling Landgraf 
---
M tests/functional/restTests.py
1 file changed, 11 insertions(+), 2 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/4956/1
--
To view, visit http://gerrit.ovirt.org/4956
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 1: Verified

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 2: Verified

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

Adam Litke has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 2: Looks good to me, but someone else must approve

While it's not ideal to me (since we are misrepresenting the vdsm version to all api users (not just engine), I guess I am ok with it since it fixes a very real problem.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

Adam Litke has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 2: Fails

The test fails as follows:

======================================================================
ERROR: testVersion (restTests.RestTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/share/vdsm/tests/functional/restTests.py", line 88, in testVersion
    rproduct, rversion, revision = revisionStr.split(".")
ValueError: need more than 2 values to unpack

----------------------------------------------------------------------

On my system, revision is: 0.262

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

Adam Litke has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 2: I would prefer that you didn't submit this

(1 inline comment)

....................................................
File tests/functional/restTests.py
Line 89:         revisionStr = rproduct + "." + rversion
How about something like:

parts = revisionStr.split(".")
revisionStr = "%s.%s" % parts[:1]

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 2: (1 inline comment)

....................................................
File tests/functional/restTests.py
Line 89:         revisionStr = rproduct + "." + rversion
ouch, as we talked over irc we don't need to check the revisionStr, since it's already stripped in the spec. thanks!

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 3: Verified

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 3: (1 inline comment)

....................................................
File tests/functional/restTests.py
Line 84:         # the two below splits.
not two anymore...

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 4: Verified

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

Adam Litke has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 4: Verified; Looks good to me, but someone else must approve

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: restTests: use short release/version
......................................................................

Patch Set 4: Looks good to me, approved

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: restTests: use short release/version
......................................................................

restTests: use short release/version

oVirt Engine cannot handle release/version with more then 2 digits.
To workaround, we add a sed command into vdsm.spec to make version/release
a short string in dsaversion.py. However, restTests is failing now because
the version provided by dsaversion are not releated to the
version string provided by REST API. This patch will add a workaround
also in restTests.py

Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Signed-off-by: Douglas Schilling Landgraf 
---
M tests/functional/restTests.py
1 file changed, 12 insertions(+), 2 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified
  Adam Litke: Verified; Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I350cd7b561d9db25f47988de290181a34b93c2c8
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Adam Litke 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf