Change in vdsm[master]: vdsm.spec: pyflakes/python-pep8 BuildRequirement
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: vdsm.spec: pyflakes/python-pep8 BuildRequirement
......................................................................
vdsm.spec: pyflakes/python-pep8 BuildRequirement
pyflakes and python-pep8 are not default RHEL packages.
This patch will move it for non rhel system requirements.
Change-Id: Ieaf21db9542ae3c9e107a94f64e0e52c7a7e62c1
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/8940/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 37f37a3..c117ee5 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -35,9 +35,7 @@
BuildRequires: python
BuildRequires: python-devel
-BuildRequires: pyflakes
BuildRequires: python-nose
-BuildRequires: python-pep8
# BuildRequires needed by the tests during the build
BuildRequires: python-ethtool
@@ -54,6 +52,8 @@
%endif
%if !0%{?rhel}
+BuildRequires: pyflakes
+BuildRequires: python-pep8
BuildRequires: systemd-units
%endif
--
To view, visit http://gerrit.ovirt.org/8940
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaf21db9542ae3c9e107a94f64e0e52c7a7e62c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years, 5 months
Change in vdsm[master]: configure.ac: pyflakes/python-pep8 reduce to warn
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: configure.ac: pyflakes/python-pep8 reduce to warn
......................................................................
configure.ac: pyflakes/python-pep8 reduce to warn
Replace error message for warning message if build
system doesn't contain pyflakes and python-pep8
packages installed.
Change-Id: Ife89071bcbd0b2b4a50166080575f09e0048cec7
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M configure.ac
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/8939/1
diff --git a/configure.ac b/configure.ac
index 450f714..7cb12ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,13 +100,13 @@
# Checking for pyflakes
AC_PATH_PROG([PYFLAKES], [pyflakes])
if test "x$PYFLAKES" = "x"; then
- AC_MSG_ERROR([pyflakes not found, please install it.])
+ AC_MSG_WARN([pyflakes not found])
fi
# Checking for pep8
AC_PATH_PROG([PEP8], [pep8])
if test "x$PEP8" = "x"; then
- AC_MSG_ERROR([python-pep8 not found, please install it.])
+ AC_MSG_WARN([python-pep8 not found])
fi
# Checking for python-devel
--
To view, visit http://gerrit.ovirt.org/8939
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife89071bcbd0b2b4a50166080575f09e0048cec7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years, 5 months
Change in vdsm[master]: doh! fix the former commit
by Dan Kenigsberg
Dan Kenigsberg has uploaded a new change for review.
Change subject: doh! fix the former commit
......................................................................
doh! fix the former commit
I've decorated the class instead of the test method :-(
Change-Id: I5d99275ee7cf04e8464f4718c765bca901178e8c
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/miscTests.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/8984/1
diff --git a/tests/miscTests.py b/tests/miscTests.py
index 93a20cd..eeb14d4 100644
--- a/tests/miscTests.py
+++ b/tests/miscTests.py
@@ -70,9 +70,9 @@
proc.wait()
-@brokentest('Test sometimes fail, when misc.getCmdArgs() returns '
- 'the empty tuple right after process creation')
class GetCmdArgsTests(TestCaseBase):
+ @brokentest('Test sometimes fail, when misc.getCmdArgs() returns '
+ 'the empty tuple right after process creation')
def test(self):
args = ("sleep", "4")
sproc = misc.execCmd(args, sync=False, sudo=False)
--
To view, visit http://gerrit.ovirt.org/8984
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d99275ee7cf04e8464f4718c765bca901178e8c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
11 years, 5 months
Change in vdsm[master]: Revert "Save a few seconds while running misc tests"
by Dan Kenigsberg
Dan Kenigsberg has uploaded a new change for review.
Change subject: Revert "Save a few seconds while running misc tests"
......................................................................
Revert "Save a few seconds while running misc tests"
This reverts commit 86a259a804fbe6ebac600511f10fdae9b093b552.
as it causes a yet-unexplained regression in jenkins's unit tests
FAIL: test (miscTests.GetCmdArgsTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/jenkins/workspace/vdsm_unit_tests/tests/miscTests.py", line 77, in test
self.assertEquals(misc.getCmdArgs(sproc.pid), args)
AssertionError: Tuples differ: () != ('sleep', '4')
Second tuple contains 2 additional elements.
First extra element 0:
sleep
- ()
+ ('sleep', '4')
Change-Id: I92ef357cb68c0d54c8520fd1f51bc8c90c0f2f22
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/miscTests.py
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/8957/1
diff --git a/tests/miscTests.py b/tests/miscTests.py
index aa03312..6339986 100644
--- a/tests/miscTests.py
+++ b/tests/miscTests.py
@@ -60,13 +60,14 @@
sleepProcs.append(misc.execCmd(["sleep", "3"], sync=False,
sudo=False))
+ time.sleep(1)
+
pids = misc.pgrep("sleep")
for proc in sleepProcs:
self.assertTrue(proc.pid in pids, "pid %d was not located by pgrep"
% proc.pid)
for proc in sleepProcs:
- proc.kill()
proc.wait()
@@ -74,8 +75,8 @@
def test(self):
args = ("sleep", "4")
sproc = misc.execCmd(args, sync=False, sudo=False)
+ time.sleep(1)
self.assertEquals(misc.getCmdArgs(sproc.pid), args)
- sproc.kill()
sproc.wait()
@@ -83,13 +84,13 @@
def test(self):
args = ["sleep", "3"]
sproc = misc.execCmd(args, sync=False, sudo=False)
+ time.sleep(1)
stats = misc.pidStat(sproc.pid)
pid = int(stats[0])
# procName comes in the format of (procname)
name = stats[1]
self.assertEquals(pid, sproc.pid)
self.assertEquals(name, args[0])
- sproc.kill()
sproc.wait()
--
To view, visit http://gerrit.ovirt.org/8957
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92ef357cb68c0d54c8520fd1f51bc8c90c0f2f22
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
11 years, 5 months
Change in vdsm[master]: Fix getCmdArgs() failing on some hosts
by smizrahi＠redhat.com
Saggi Mizrahi has uploaded a new change for review.
Change subject: Fix getCmdArgs() failing on some hosts
......................................................................
Fix getCmdArgs() failing on some hosts
Change-Id: Id06b03192f065d975c078e865e8514441e81450c
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com>
---
M vdsm/storage/misc.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/8974/1
diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py
index 426d181..945e3b2 100644
--- a/vdsm/storage/misc.py
+++ b/vdsm/storage/misc.py
@@ -1068,7 +1068,7 @@
def getCmdArgs(pid):
with open("/proc/%d/cmdline" % pid, "r") as f:
- return tuple(f.readline().split("\0")[:-1])
+ return tuple(f.read().split("\0")[:-1])
def pidStat(pid):
--
To view, visit http://gerrit.ovirt.org/8974
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id06b03192f065d975c078e865e8514441e81450c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
11 years, 5 months
Change in vdsm[master]: Don't ignore nfs_mount_options in vdsm.conf
by gpadgett＠redhat.com
Greg Padgett has uploaded a new change for review.
Change subject: Don't ignore nfs_mount_options in vdsm.conf
......................................................................
Don't ignore nfs_mount_options in vdsm.conf
The nfs_mount_options configuration setting in vdsm.conf was ignored.
The options will now be processed, but options passed to VDSM from the
backend will take priority.
Change-Id: I3c1d13bfd98a9b41b9728bdcb7f01b3161c26bd8
Signed-off-by: Greg Padgett <gpadgett(a)redhat.com>
---
M vdsm/storage/fileUtils.py
M vdsm/storage/storageServer.py
2 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/5368/1
--
To view, visit http://gerrit.ovirt.org/5368
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c1d13bfd98a9b41b9728bdcb7f01b3161c26bd8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com>
11 years, 5 months