Commit 6db6993a authored by Jérome Perrin's avatar Jérome Perrin

software/monitor/test: fix some ResourceWarning

parent 9abe14c8
Pipeline #23479 failed with stage
in 0 seconds
...@@ -162,18 +162,19 @@ class EdgeMixin(object): ...@@ -162,18 +162,19 @@ class EdgeMixin(object):
) )
for instance_reference in self.surykatka_dict: for instance_reference in self.surykatka_dict:
for info_dict in self.surykatka_dict[instance_reference].values(): for info_dict in self.surykatka_dict[instance_reference].values():
self.assertEqual( with open(info_dict['ini-file']) as fh:
info_dict['expected_ini'].strip() % info_dict, self.assertEqual(
open(info_dict['ini-file']).read().strip() info_dict['expected_ini'].strip() % info_dict,
) fh.read().strip()
)
def assertPromiseContent(self, instance_reference, name, content): def assertPromiseContent(self, instance_reference, name, content):
promise = open( with open(
os.path.join( os.path.join(
self.slap.instance_directory, instance_reference, 'etc', 'plugin', name self.slap.instance_directory, instance_reference, 'etc', 'plugin', name
)).read().strip() )) as fh:
promise = fh.read().strip()
self.assertTrue(content in promise) self.assertIn(content, promise)
def assertSurykatkaBotPromise(self): def assertSurykatkaBotPromise(self):
for instance_reference in self.surykatka_dict: for instance_reference in self.surykatka_dict:
...@@ -190,10 +191,11 @@ class EdgeMixin(object): ...@@ -190,10 +191,11 @@ class EdgeMixin(object):
def assertSurykatkaCron(self): def assertSurykatkaCron(self):
for instance_reference in self.surykatka_dict: for instance_reference in self.surykatka_dict:
for info_dict in self.surykatka_dict[instance_reference].values(): for info_dict in self.surykatka_dict[instance_reference].values():
self.assertEqual( with open(info_dict['status-cron']) as fh:
'*/2 * * * * %s' % (info_dict['status-json'],), self.assertEqual(
open(info_dict['status-cron']).read().strip() '*/2 * * * * %s' % (info_dict['status-json'],),
) fh.read().strip()
)
def initiateSurykatkaRun(self): def initiateSurykatkaRun(self):
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment