9:59 a.m.
Francesco Romani has uploaded a new change for review.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
tests: mom: create the socket under tmpdir
Some tests may fail under automation if Vdsm
is built and its test are run under a too nested
directory.
This because the absolute path of the UNIX domain
socket becomes too long.
To fix this, we create the socket under a temporary
directory.
This also makes cleanup a little easier.
Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
M tests/momTests.py
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/62779/1
diff --git a/tests/momTests.py b/tests/momTests.py
index 764aa57..c454dcb 100644
--- a/tests/momTests.py
+++ b/tests/momTests.py
@@ -19,6 +19,8 @@
from unittest import TestCase
import logging
+import shutil
+import tempfile
import threading
from vdsm.define import Mbytes
from vdsm.momIF import MomClient
@@ -30,7 +32,7 @@
from vdsm import cpuarch
MOM_CONF = "/dev/null"
-MOM_PORT = os.path.join(os.path.dirname(__file__), "test_mom_vdsm.sock")
+MOM_SOCK = "test_mom_vdsm.sock"
class DummyMomApi(object):
@@ -67,12 +69,20 @@
# added during the tests.
@monkeypatch.MonkeyClass(logging.getLogger().manager, "loggerDict", {})
class MomPolicyTests(TestCase):
+
+ _TMP_DIR = '/tmp'
+
def setUp(self):
+ self._tmp_dir = tempfile.mkdtemp(dir=self._TMP_DIR)
self.config_overrides = configparser.SafeConfigParser()
self.config_overrides.add_section("logging")
self.config_overrides.set("logging", "log",
"stdio")
self.config_overrides.add_section("main")
- self.config_overrides.set("main", "rpc-port", str(MOM_PORT))
+ self.config_overrides.set("main", "rpc-port",
+ os.path.join(self._tmp_dir, MOM_SOCK))
+
+ def tearDown(self):
+ shutil.rmtree(self._tmp_dir)
def _getMomClient(self):
return MomClient(MOM_CONF, self.config_overrides)
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
9:59 a.m.
gerrit-hooks has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
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/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
10:18 a.m.
Francesco Romani has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 1: Verified+1
test still run, hence V+1
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
4:59 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 1: Code-Review-1
(1 comment)
https://gerrit.ovirt.org/#/c/62779/1/tests/momTests.py
File tests/momTests.py:
PS1, Line 76: dir=self._TMP_DIR
I think tempfile does the Right Thing by default, using tempfile.gettempdir() which is
/tmp on most cases. Please use it unless there's a really good reason not to.
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
5:01 a.m.
Martin Sivák has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 1:
(1 comment)
https://gerrit.ovirt.org/#/c/62779/1/tests/momTests.py
File tests/momTests.py:
PS1, Line 76: dir=self._TMP_DIR
I think tempfile does the Right Thing by default, using
tempfile.gettempdir
I agree here. We should be using the system default.
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
5:50 a.m.
Francesco Romani has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 1:
(1 comment)
https://gerrit.ovirt.org/#/c/62779/1/tests/momTests.py
File tests/momTests.py:
PS1, Line 76: dir=self._TMP_DIR
I agree here. We should be using the system default.
No good
reason, so I'll update the patch.
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
10:13 a.m.
gerrit-hooks has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 2:
* 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/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
10:13 a.m.
Francesco Romani has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 2: Verified+1
copied score, jenkins verification is sufficient.
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
3:16 p.m.
Yaniv Bronhaim has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
2:43 a.m.
Roman Mohr has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6:06 a.m.
Martin Sivák has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 2: Code-Review+1
I do not think we need the explicit tmpdir, but I do not have any fundamental issue with
it.
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
8:46 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
8:46 a.m.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
tests: mom: create the socket under tmpdir
Some tests may fail under automation if Vdsm
is built and its test are run under a too nested
directory.
This because the absolute path of the UNIX domain
socket becomes too long.
To fix this, we create the socket under a temporary
directory.
This also makes cleanup a little easier.
Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
Reviewed-on: https://gerrit.ovirt.org/62779
Continuous-Integration: Jenkins CI
Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
Reviewed-by: Roman Mohr <rmohr(a)redhat.com>
Reviewed-by: Martin Sivák <msivak(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/momTests.py
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Martin Sivák: Looks good to me, but someone else must approve
Roman Mohr: Looks good to me, but someone else must approve
Yaniv Bronhaim: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
Francesco Romani: Verified
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8:46 a.m.
gerrit-hooks has posted comments on this change.
Change subject: tests: mom: create the socket under tmpdir
......................................................................
Patch Set 3:
* Update tracker: IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.
--
To view, visit https://gerrit.ovirt.org/62779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib41253a58e8abadeb99d57072ace75461a8e078b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
2813
days inactive
2826
days old
vdsm-patches@lists.fedorahosted.org
13 comments
6 participants
participants (6)
-
automation＠ovirt.org -
Dan Kenigsberg -
fromani＠redhat.com -
Martin Sivak -
rmohr＠redhat.com -
ybronhei＠redhat.com