Change in vdsm[master]: oop: fix tests

Yeela Kaplan has uploaded a new change for review.

Change subject: oop: fix tests
......................................................................

oop: fix tests

Change-Id: I9dfd7d2815d70566fc3a95760058e45e9dcfeab3
Signed-off-by: Yeela Kaplan 
---
M tests/outOfProcessTests.py
1 file changed, 12 insertions(+), 6 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/34765/1

diff --git a/tests/outOfProcessTests.py b/tests/outOfProcessTests.py
index 94918a0..c9682ed 100644
--- a/tests/outOfProcessTests.py
+++ b/tests/outOfProcessTests.py
@@ -20,6 +20,7 @@

from testlib import VdsmTestCase as TestCaseBase
 import storage.outOfProcess as oop
+import logging
 import os
 import tempfile
 import time
@@ -30,11 +31,14 @@

class OopWrapperTests(TestCaseBase):
-    IOPROC_IDLE_TIME = config.getint("irs", "max_ioprocess_idle_time")

def setUp(self):
         oop.setDefaultImpl(oop.IOPROC)
         self.pool = oop.getGlobalProcPool()
+
+    def tearDown(self):
+        self.pool._ioproc.close()
+        oop._refProcPool = {}

def testSamePoolName(self):
         poolA = "A"
@@ -59,23 +63,25 @@
         self.assertNotEquals(pids[0], pids[1])

def testAmountOfInstancesPerPoolName(self):
+        import gc
+        oop.IOPROC_IDLE_TIME = 5
         poolA = "A"
         poolB = "B"
         wrapper = ref(oop.getProcessPool(poolA))
         ioproc = ref(oop.getProcessPool(poolA)._ioproc)
         oop.getProcessPool(poolA)
-        time.sleep(self.IOPROC_IDLE_TIME + 1)
+        time.sleep(oop.IOPROC_IDLE_TIME + 1)
         oop.getProcessPool(poolB)
         self.assertEquals(wrapper(), None)
-        import gc
         gc.collect()
         time.sleep(1)
         gc.collect()
-        print "GARBAGE: ", gc.garbage
+        logging.info("GARBAGE: %s", gc.garbage)
         refs = gc.get_referrers(ioproc())
-        print refs
-        print gc.get_referrers(*refs)
+        logging.info(refs)
+        logging.info(gc.get_referrers(*refs))
         self.assertEquals(ioproc(), None)
+        oop.IOPROC_IDLE_TIME = config.getint("irs", "max_ioprocess_idle_time")

def testEcho(self):
         data = """Censorship always defeats it own purpose, for it creates in

Yeela Kaplan has posted comments on this change.

Change subject: oop: fix tests
......................................................................

Patch Set 1: Verified+1

Saggi Mizrahi has posted comments on this change.

Change subject: oop: fix tests
......................................................................

Patch Set 2: Code-Review+2 Verified+1

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: oop: fix tests
......................................................................

Patch Set 1:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13341/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/13181/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/12391/ : FAILURE

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: oop: fix tests
......................................................................

Patch Set 2:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13342/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/13182/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/12392/ : FAILURE

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: oop: fix tests
......................................................................

oop: fix tests

Change-Id: I9dfd7d2815d70566fc3a95760058e45e9dcfeab3
Signed-off-by: Yeela Kaplan 
Reviewed-on: http://gerrit.ovirt.org/34765
Reviewed-by: Saggi Mizrahi 
Tested-by: Saggi Mizrahi 
---
M tests/outOfProcessTests.py
1 file changed, 27 insertions(+), 18 deletions(-)

Approvals:
  Saggi Mizrahi: Verified; Looks good to me, approved

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: oop: fix tests
......................................................................

Patch Set 3:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/154/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/177/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/370/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/6002/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/175/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/170/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4163/ : FAILURE