Commit abcaaa47 authored by Rafael Monnerat's avatar Rafael Monnerat 👻

slapos_slap_tool: Close open files from test

  This solves a lot of warnings in python3
parent d110d7c4
...@@ -49,6 +49,7 @@ def canonical_xml(xml): ...@@ -49,6 +49,7 @@ def canonical_xml(xml):
)) ))
class TestSlapOSSlapToolMixin(SlapOSTestCaseMixin): class TestSlapOSSlapToolMixin(SlapOSTestCaseMixin):
maxDiff = None
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
self.portal_slap = self.portal.portal_slap self.portal_slap = self.portal.portal_slap
...@@ -763,7 +764,8 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin): ...@@ -763,7 +764,8 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
os.unlink(self.compute_node_bang_simulator) os.unlink(self.compute_node_bang_simulator)
def assertLoadComputeNodeConfigurationFromXML(self, args, kwargs): def assertLoadComputeNodeConfigurationFromXML(self, args, kwargs):
stored = eval(open(self.compute_node_load_configuration_simulator).read()) #pylint: disable=eval-used with open(self.compute_node_load_configuration_simulator) as f:
stored = eval(f.read()) #pylint: disable=eval-used
# do the same translation magic as in workflow # do the same translation magic as in workflow
self.assertEqual(stored, self.assertEqual(stored,
[{'recargs': args, 'reckwargs': kwargs, [{'recargs': args, 'reckwargs': kwargs,
...@@ -1025,7 +1027,8 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin): ...@@ -1025,7 +1027,8 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
self.assertEqual("", response.body) self.assertEqual("", response.body)
def assertReportComputeNodeConsumption(self, args, kwargs): def assertReportComputeNodeConsumption(self, args, kwargs):
stored = eval(open(self.compute_node_use_compute_node_simulator).read()) #pylint: disable=eval-used with open(self.compute_node_use_compute_node_simulator) as f:
stored = eval(f.read()) #pylint: disable=eval-used
# do the same translation magic as in workflow # do the same translation magic as in workflow
self.assertEqual(stored, self.assertEqual(stored,
[{'recargs': args, 'reckwargs': kwargs, [{'recargs': args, 'reckwargs': kwargs,
...@@ -1639,7 +1642,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1639,7 +1642,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
self.assertXMLEqual(expected_xml, got_xml) self.assertXMLEqual(expected_xml, got_xml)
def assertInstanceUpdateConnectionSimulator(self, args, kwargs): def assertInstanceUpdateConnectionSimulator(self, args, kwargs):
stored = eval(open(self.instance_update_connection_simulator).read()) #pylint: disable=eval-used with open(self.instance_update_connection_simulator) as f:
stored = eval(f.read()) #pylint: disable=eval-used
# do the same translation magic as in workflow # do the same translation magic as in workflow
kwargs['connection_xml'] = kwargs.pop('connection_xml') kwargs['connection_xml'] = kwargs.pop('connection_xml')
self.assertEqual(stored, self.assertEqual(stored,
...@@ -1857,7 +1861,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1857,7 +1861,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
self.assertXMLEqual(expected_xml, got_xml) self.assertXMLEqual(expected_xml, got_xml)
def assertInstanceBangSimulator(self, args, kwargs): def assertInstanceBangSimulator(self, args, kwargs):
stored = eval(open(self.instance_bang_simulator).read()) #pylint: disable=eval-used with open(self.instance_bang_simulator) as f:
stored = eval(f.read()) #pylint: disable=eval-used
# do the same translation magic as in workflow # do the same translation magic as in workflow
kwargs['comment'] = kwargs.pop('comment') kwargs['comment'] = kwargs.pop('comment')
self.assertEqual(stored, self.assertEqual(stored,
...@@ -1918,9 +1924,10 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1918,9 +1924,10 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
finally: finally:
if os.path.exists(self.instance_bang_simulator): if os.path.exists(self.instance_bang_simulator):
os.unlink(self.instance_bang_simulator) os.unlink(self.instance_bang_simulator)
def assertInstanceRenameSimulator(self, args, kwargs): def assertInstanceRenameSimulator(self, args, kwargs):
stored = eval(open(self.instance_rename_simulator).read()) #pylint: disable=eval-used with open(self.instance_rename_simulator) as f:
stored = eval(f.read()) #pylint: disable=eval-used
# do the same translation magic as in workflow # do the same translation magic as in workflow
self.assertEqual(stored, self.assertEqual(stored,
[{'recargs': args, 'reckwargs': kwargs, [{'recargs': args, 'reckwargs': kwargs,
...@@ -1945,7 +1952,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1945,7 +1952,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
finally: finally:
if os.path.exists(self.instance_rename_simulator): if os.path.exists(self.instance_rename_simulator):
os.unlink(self.instance_rename_simulator) os.unlink(self.instance_rename_simulator)
def test_destroyedComputePartition(self): def test_destroyedComputePartition(self):
self._makeComplexComputeNode(self.project) self._makeComplexComputeNode(self.project)
partition_id = self.destroy_requested_software_instance.getAggregateValue( partition_id = self.destroy_requested_software_instance.getAggregateValue(
...@@ -1968,7 +1975,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1968,7 +1975,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
self.assertEqual(ssl_cert, self.destroy_requested_software_instance.getSslCertificate()) self.assertEqual(ssl_cert, self.destroy_requested_software_instance.getSslCertificate())
def assertInstanceRequestSimulator(self, args, kwargs): def assertInstanceRequestSimulator(self, args, kwargs):
stored = eval(open(self.instance_request_simulator).read()) #pylint: disable=eval-used with open(self.instance_request_simulator) as f:
stored = eval(f.read()) #pylint: disable=eval-used
# do the same translation magic as in workflow # do the same translation magic as in workflow
self.assertEqual(stored, self.assertEqual(stored,
[{'recargs': args, 'reckwargs': kwargs, [{'recargs': args, 'reckwargs': kwargs,
...@@ -2557,7 +2565,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2557,7 +2565,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
self.assertXMLEqual(expected_xml, got_xml) self.assertXMLEqual(expected_xml, got_xml)
def assertComputeNodeBangSimulator(self, args, kwargs): def assertComputeNodeBangSimulator(self, args, kwargs):
stored = eval(open(self.compute_node_bang_simulator).read()) #pylint: disable=eval-used with open(self.compute_node_bang_simulator) as f:
stored = eval(f.read()) #pylint: disable=eval-used
# do the same translation magic as in workflow # do the same translation magic as in workflow
kwargs['comment'] = kwargs.pop('comment') kwargs['comment'] = kwargs.pop('comment')
self.assertEqual(stored, self.assertEqual(stored,
......
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