From 866644bdf20fa9301325554b95703809c42829dd Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Mon, 17 Apr 2023 10:45:10 +0200 Subject: [PATCH] Remote more .. files created in tests --- test/unit/test_dic_jobs.py | 8 +++++++- test/unit/test_job_graph.py | 9 ++++++++- test/unit/test_job_grouping.py | 9 ++++++++- test/unit/test_wrappers.py | 12 +++++++++--- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/test/unit/test_dic_jobs.py b/test/unit/test_dic_jobs.py index 40b7dadff..6ad170e26 100644 --- a/test/unit/test_dic_jobs.py +++ b/test/unit/test_dic_jobs.py @@ -3,6 +3,8 @@ from unittest import TestCase from mock import Mock import math +import shutil +import tempfile from autosubmitconfigparser.config.yamlparser import YAMLParserFactory from autosubmit.job.job_common import Status from autosubmit.job.job_common import Type @@ -19,8 +21,9 @@ class TestDicJobs(TestCase): self.as_conf.experiment_data["JOBS"] = dict() self.as_conf.jobs_data = self.as_conf.experiment_data["JOBS"] self.as_conf.experiment_data["PLATFORMS"] = dict() + self.temp_directory = tempfile.mkdtemp() self.job_list = JobList(self.experiment_id, FakeBasicConfig, YAMLParserFactory(), - JobListPersistenceDb('.', '.'),self.as_conf) + JobListPersistenceDb(self.temp_directory, 'db'),self.as_conf) self.parser_mock = Mock(spec='SafeConfigParser') self.date_list = ['fake-date1', 'fake-date2'] self.member_list = ['fake-member1', 'fake-member2'] @@ -31,6 +34,9 @@ class TestDicJobs(TestCase): self.dictionary = DicJobs(self.job_list,self.date_list, self.member_list, self.chunk_list, self.date_format, self.default_retrials,self.as_conf.jobs_data,self.as_conf) + def tearDown(self) -> None: + shutil.rmtree(self.temp_directory) + def test_read_section_running_once_create_jobs_once(self): # arrange section = 'fake-section' diff --git a/test/unit/test_job_graph.py b/test/unit/test_job_graph.py index 100655a31..c7e70b7e4 100644 --- a/test/unit/test_job_graph.py +++ b/test/unit/test_job_graph.py @@ -1,3 +1,6 @@ +import shutil +import tempfile + from unittest import TestCase from mock import Mock @@ -18,8 +21,9 @@ class TestJobGraph(TestCase): self.as_conf.experiment_data["JOBS"] = dict() self.as_conf.jobs_data = self.as_conf.experiment_data["JOBS"] self.as_conf.experiment_data["PLATFORMS"] = dict() + self.temp_directory = tempfile.mkdtemp() self.job_list = JobList(self.experiment_id, FakeBasicConfig, YAMLParserFactory(), - JobListPersistenceDb('.', '.'),self.as_conf) + JobListPersistenceDb(self.temp_directory, 'db'),self.as_conf) self.parser_mock = Mock(spec='SafeConfigParser') # Basic workflow with SETUP, INI, SIM, POST, CLEAN @@ -50,6 +54,9 @@ class TestJobGraph(TestCase): job.add_parent(self.job_list.get_job_by_name('expid_' + date + '_' + member + '_' + str(chunk) + '_POST')) self.job_list.get_job_list().append(job) + def tearDown(self) -> None: + shutil.rmtree(self.temp_directory) + def test_grouping_date(self): groups_dict = dict() groups_dict['status'] = {'d1': Status.WAITING, 'd2': Status.WAITING} diff --git a/test/unit/test_job_grouping.py b/test/unit/test_job_grouping.py index 03223a101..35dd4b54a 100644 --- a/test/unit/test_job_grouping.py +++ b/test/unit/test_job_grouping.py @@ -1,3 +1,6 @@ +import shutil +import tempfile + from unittest import TestCase from mock import Mock from autosubmit.job.job_list import JobList @@ -20,8 +23,9 @@ class TestJobGrouping(TestCase): self.as_conf.experiment_data["JOBS"] = dict() self.as_conf.jobs_data = self.as_conf.experiment_data["JOBS"] self.as_conf.experiment_data["PLATFORMS"] = dict() + self.temp_directory = tempfile.mkdtemp() self.job_list = JobList(self.experiment_id, FakeBasicConfig, YAMLParserFactory(), - JobListPersistenceDb('.', '.'),self.as_conf) + JobListPersistenceDb(self.temp_directory, 'db'),self.as_conf) self.parser_mock = Mock(spec='SafeConfigParser') # Basic workflow with SETUP, INI, SIM, POST, CLEAN @@ -40,6 +44,9 @@ class TestJobGrouping(TestCase): job = self._createDummyJob('expid_' + date + '_' + member + '_' + str(chunk) + '_' + section, Status.WAITING, date, member, chunk) self.job_list.get_job_list().append(job) + def tearDown(self) -> None: + shutil.rmtree(self.temp_directory) + def test_group_by_date(self): groups_dict = dict() diff --git a/test/unit/test_wrappers.py b/test/unit/test_wrappers.py index b3eed1a60..52c79aa5c 100644 --- a/test/unit/test_wrappers.py +++ b/test/unit/test_wrappers.py @@ -1,5 +1,8 @@ +import shutil +import tempfile + from unittest import TestCase -from mock import Mock,MagicMock +from mock import MagicMock from autosubmit.job.job_packager import JobPackager from autosubmit.job.job_packages import JobPackageVertical from autosubmit.job.job import Job @@ -11,7 +14,6 @@ from autosubmit.job.job_list_persistence import JobListPersistenceDb from autosubmit.job.job_common import Status from random import randrange from collections import OrderedDict -import pytest class TestWrappers(TestCase): @@ -160,8 +162,9 @@ class TestWrappers(TestCase): self.as_conf.experiment_data["PLATFORMS"] = dict() self.as_conf.experiment_data["WRAPPERS"] = dict() + self.temp_directory = tempfile.mkdtemp() self.job_list = JobList(self.experiment_id, self.config, YAMLParserFactory(), - JobListPersistenceDb('.', '.'),self.as_conf) + JobListPersistenceDb(self.temp_directory, 'db'),self.as_conf) self.parser_mock = MagicMock(spec='SafeConfigParser') self._platform.max_waiting_jobs = 100 @@ -189,6 +192,9 @@ class TestWrappers(TestCase): self.as_conf, self._platform, self.job_list) self.job_list._ordered_jobs_by_date_member["WRAPPERS"] = dict() + def tearDown(self) -> None: + shutil.rmtree(self.temp_directory) + ### ONE SECTION WRAPPER ### def test_returned_packages(self): self.current_wrapper_section = {} -- GitLab