Unuse resources after every test
Fix bug in put_all(). That method was unused before this commit. Clean the process list after the processes are stopped, otherwise the suite eventually fails with a 'process terminated prematurely' error. Before it was not necessary because it was not reused (a new suite run was created). Change-Id: Iee12866045145544076c6c18786e1a54f18fc293
This commit is contained in:
parent
d091233934
commit
1dd2955cb1
|
@ -508,11 +508,11 @@ class ReservedResources(log.Origin):
|
||||||
my_item.pop(USED_KEY)
|
my_item.pop(USED_KEY)
|
||||||
|
|
||||||
def put_all(self):
|
def put_all(self):
|
||||||
|
if not self.reserved:
|
||||||
|
return
|
||||||
for key, item_list in self.reserved.items():
|
for key, item_list in self.reserved.items():
|
||||||
my_list = self.get(key)
|
for item in item_list:
|
||||||
for my_item in my_list:
|
item.pop(USED_KEY, None)
|
||||||
if my_item.get(USED_KEY):
|
|
||||||
my_item.pop(USED_KEY)
|
|
||||||
|
|
||||||
def free(self):
|
def free(self):
|
||||||
if self.reserved:
|
if self.reserved:
|
||||||
|
|
|
@ -256,6 +256,9 @@ class SuiteRun(log.Origin):
|
||||||
continue
|
continue
|
||||||
self.current_test = test
|
self.current_test = test
|
||||||
test.run()
|
test.run()
|
||||||
|
self.stop_processes()
|
||||||
|
self.objects_cleanup()
|
||||||
|
self.reserved_resources.put_all()
|
||||||
except Exception:
|
except Exception:
|
||||||
log.log_exn()
|
log.log_exn()
|
||||||
except BaseException as e:
|
except BaseException as e:
|
||||||
|
@ -303,10 +306,8 @@ class SuiteRun(log.Origin):
|
||||||
self._processes.insert(0, process)
|
self._processes.insert(0, process)
|
||||||
|
|
||||||
def stop_processes(self):
|
def stop_processes(self):
|
||||||
if not self._processes:
|
while self._processes:
|
||||||
return
|
self._processes.pop().terminate()
|
||||||
for process in self._processes:
|
|
||||||
process.terminate()
|
|
||||||
|
|
||||||
def free_resources(self):
|
def free_resources(self):
|
||||||
if self.reserved_resources is None:
|
if self.reserved_resources is None:
|
||||||
|
|
Loading…
Reference in New Issue