Change in vdsm[master]: tests: making sure that after events changes all tests passes
piotr.kliczewski at gmail.com
piotr.kliczewski at gmail.com
Mon Mar 23 09:14:32 UTC 2015
Piotr Kliczewski has uploaded a new change for review.
Change subject: tests: making sure that after events changes all tests passes
......................................................................
tests: making sure that after events changes all tests passes
Change-Id: I23302c7f742f31f0ab5e12265da3bb7f57a81d80
Signed-off-by: pkliczewski <piotr.kliczewski at gmail.com>
---
M tests/protocoldetectorTests.py
M tests/scheduleTests.py
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/39031/1
diff --git a/tests/protocoldetectorTests.py b/tests/protocoldetectorTests.py
index 8ef1582..4350e8d 100644
--- a/tests/protocoldetectorTests.py
+++ b/tests/protocoldetectorTests.py
@@ -58,8 +58,9 @@
client_socket.setblocking(1)
client_socket.sendall(response)
finally:
- client_socket.shutdown(socket.SHUT_RDWR)
- client_socket.close()
+ if client_socket is not None:
+ client_socket.shutdown(socket.SHUT_RDWR)
+ client_socket.close()
t = threading.Thread(target=run)
t.daemon = True
diff --git a/tests/scheduleTests.py b/tests/scheduleTests.py
index 4a5e52f..2774dda 100644
--- a/tests/scheduleTests.py
+++ b/tests/scheduleTests.py
@@ -24,7 +24,7 @@
from vdsm import schedule
from vdsm import utils
from testlib import VdsmTestCase
-from testValidation import slowtest, brokentest
+from testValidation import slowtest
from testlib import permutations, expandPermutations
@@ -94,7 +94,6 @@
task.wait(delay + self.GRACETIME)
self.assertEquals(task.call_time, None)
- @brokentest
@permutations(PERMUTATIONS)
def test_cancel_call_many(self, clock):
self.create_scheduler(clock)
@@ -121,7 +120,6 @@
task.wait(delay + self.GRACETIME)
self.assertEquals(task.call_time, None)
- @brokentest
@permutations(PERMUTATIONS)
def test_stop_scheduler_many(self, clock):
self.create_scheduler(clock)
--
To view, visit https://gerrit.ovirt.org/39031
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23302c7f742f31f0ab5e12265da3bb7f57a81d80
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski at gmail.com>
More information about the vdsm-patches
mailing list