Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Dan Kenigsberg has submitted this change and it was merged. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Removing mocking of _start function and add extraCmd variable to proxy Instead of adding monkeyPatch only for adding PYTHONPATH before running the command, setting self.extraCmd will append extra field to the execution. Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Signed-off-by: Yaniv Bronhaim --- M tests/superVdsmTests.py M vdsm/supervdsm.py 2 files changed, 5 insertions(+), 23 deletions(-) Approvals: Yaniv Bronhaim: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Dan Kenigsberg has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: Looks good to me, approved Oh right. Sudo squashes env changes. Thanks. -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Yaniv Bronhaim has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: It doesn't work. As I wrote, you need to specify the path with the sudo command, otherwise you get root evn and you need to pass it to the execCmd, so it'll be almost the same as adding it to the command itself. Lets keep this patch if you accept it. It works and flexible for more use cases. -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Dan Kenigsberg has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: Well, you said that you disliked your current solution, so I'm raising other ideas. The nicety of changing os.environ is that you avoid adding test-specific code to vdsm proper. I can live with your current suggestion, but thought that setting supervdsm's PYTHONPATH is cleaner. -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Yaniv Bronhaim has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: >> so how about modifying os.environ['PYTHONPATH'] before the _start() call? The execCmd overrides env and it won't work. I can pass it with env variable to execCmd, and it'll be the same.. isn't that way simpler? It doesn't matter much how we pass it, and adding extra fields before executing the command could be also valuable for other use cases in the future.. like adding coverage check, analysis and more (for tests purposes). -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Dan Kenigsberg has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: I would prefer that you didn't submit this so how about modifying os.environ['PYTHONPATH'] before the _start() call? (-1 for visibility) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Bala.FA Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Yaniv Bronhaim has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: Verified (1 inline comment) Again, Don't like the additional code only for tests reasons. It's unclear and ugly. File vdsm/supervdsm.py Line 51 Line 52 Line 53 Line 54 Line 55 probably this one of my tries to mock the extra path, and i missed removing it.. -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: Fails Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2255/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2194/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1355/ : FAILURE -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1355/ (3/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2194/ (1/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 3: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2255/ (2/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2254/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2193/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1354/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Yaniv Bronhaim has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 2: Verified I don't like it much.. it seems weird and must be better way to do that -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 2: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2254/ (2/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 2: Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2193/ (3/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 2: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1354/ (1/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2253/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2192/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1353/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 1: Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2192/ (3/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 1: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2253/ (2/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
oVirt Jenkins CI Server has posted comments on this change. Change subject: Removing mocking of _start function and add extraCmd variable to proxy .. Patch Set 1: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1353/ (1/3) -- To view, visit http://gerrit.ovirt.org/14585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Removing mocking of _start function and add extraCmd variabl...
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Removing mocking of _start function and add extraCmd variable
to proxy
..
Removing mocking of _start function and add extraCmd variable to proxy
Instead of adding monkeyPatch only for adding PYTHONPATH before running
the command, setting self.extraCmd will append extra field to the
execution.
Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca
Signed-off-by: Yaniv Bronhaim
---
M tests/superVdsmTests.py
M vdsm/supervdsm.py
2 files changed, 5 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/14585/1
diff --git a/tests/superVdsmTests.py b/tests/superVdsmTests.py
index ba8c4ee..01a1db2 100644
--- a/tests/superVdsmTests.py
+++ b/tests/superVdsmTests.py
@@ -4,9 +4,6 @@
import tempfile
from vdsm import utils
import os
-import uuid
-from vdsm import constants
-from monkeypatch import MonkeyPatch
@utils.memoized
@@ -20,21 +17,6 @@
return pyPath
-def monkeyStart(self):
-self._authkey = str(uuid.uuid4())
-self._log.debug("Launching Super Vdsm")
-
-superVdsmCmd = [getNeededPythonPath(), constants.EXT_PYTHON,
-supervdsm.SUPERVDSM,
-self._authkey, str(os.getpid()),
-self.pidfile, self.timestamp, self.address,
-str(os.getuid())]
-p = utils.execCmd(superVdsmCmd, sync=False, sudo=True)
-p.wait(2)
-if p.returncode:
-utils.panic('executing supervdsm failed')
-
-
class TestSuperVdsm(TestCaseBase):
def setUp(self):
testValidation.checkSudo(['python', supervdsm.SUPERVDSM])
@@ -46,6 +28,7 @@
self.addfd, address = tempfile.mkstemp()
self._proxy.setIPCPaths(pidfile, timestamp, address)
+self._proxy.extraCmd = getNeededPythonPath()
def tearDown(self):
supervdsm.extraPythonPathList = []
@@ -53,12 +36,10 @@
os.close(fd)
self._proxy.kill() # cleanning old temp files
-@MonkeyPatch(supervdsm.SuperVdsmProxy, '_start', monkeyStart)
def testIsSuperUp(self):
self._proxy.ping() # this call initiate svdsm
self.assertTrue(self._proxy.isRunning())
-@MonkeyPatch(supervdsm.SuperVdsmProxy, '_start', monkeyStart)
def testKillSuper(self):
self._proxy.ping()
self._proxy.kill()
@@ -66,7 +47,6 @@
self._proxy.ping() # Launching vdsm after kill
self.assertTrue(self._proxy.isRunning())
-@MonkeyPatch(supervdsm.SuperVdsmProxy, '_start', monkeyStart)
def testNoPidFile(self):
self._proxy.ping() # svdsm is up
self.assertTrue(self._proxy.isRunning())
diff --git a/vdsm/supervdsm.py b/vdsm/supervdsm.py
index a4bf74f..749ed41 100644
--- a/vdsm/supervdsm.py
+++ b/vdsm/supervdsm.py
@@ -100,6 +100,7 @@
# Declaration of public variables that keep files' names that svdsm
# uses. We need to be able to change these variables so that running
# tests doesn't disturb and already running VDSM on the host.
+self.extraCmd = None
self.setIPCPaths(PIDFILE, TIMESTAMP, ADDRESS)
def setIPCPaths(self, pidfile, timestamp, address):
@@ -128,6 +129,9 @@
self.pidfile, self.timestamp, self.address,
str(os.getuid())]
+if self.extraCmd:
+superVdsmCmd.insert(0, self.extraCmd)
+
p = utils.execCmd(superVdsmCmd, sync=False, sudo=True)
p.wait(2)
if p.returncode:
--
To view, visit http://gerrit.ovirt.org/14585
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I790fb1366bcfd369bd6be1618c284f2a945c19ca
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
