Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-17 13:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

BasePolicy: Make an easy accessor for state_dir

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-08-05 07:03:44 +00:00
parent b0e193d955
commit 8e9e099a67
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
britney2/policies/autopkgtest.py
View File

@ -76,7 +76,7 @@ class AutopkgtestPolicy(BasePolicy):
# tests requested in this and previous runs # tests requested in this and previous runs
# trigger -> src -> [arch] # trigger -> src -> [arch]
self.pending_tests = None self.pending_tests = None
self.pending_tests_file = os.path.join(self.options.state_dir, 'autopkgtest-pending.json') self.pending_tests_file = os.path.join(self.state_dir, 'autopkgtest-pending.json')
# results map: trigger -> src -> arch -> [passed, version, run_id] # results map: trigger -> src -> arch -> [passed, version, run_id]
# - trigger is "source/version" of an unstable package that triggered # - trigger is "source/version" of an unstable package that triggered
@ -91,7 +91,7 @@ class AutopkgtestPolicy(BasePolicy):
if self.options.adt_shared_results_cache: if self.options.adt_shared_results_cache:
self.results_cache_file = self.options.adt_shared_results_cache self.results_cache_file = self.options.adt_shared_results_cache
else: else:
self.results_cache_file = os.path.join(self.options.state_dir, 'autopkgtest-results.cache') self.results_cache_file = os.path.join(self.state_dir, 'autopkgtest-results.cache')
try: try:
self.options.adt_ppas = self.options.adt_ppas.strip().split() self.options.adt_ppas = self.options.adt_ppas.strip().split()
@ -116,7 +116,7 @@ class AutopkgtestPolicy(BasePolicy):
def initialise(self, britney): def initialise(self, britney):
super().initialise(britney) super().initialise(britney)
os.makedirs(self.options.state_dir, exist_ok=True) os.makedirs(self.state_dir, exist_ok=True)
self.read_pending_tests() self.read_pending_tests()
if not hasattr(self.options, 'adt_baseline'): if not hasattr(self.options, 'adt_baseline'):

18
britney2/policies/policy.py
View File

@ -35,6 +35,10 @@ class BasePolicy(object):
logger_name = ".".join((self.__class__.__module__, self.__class__.__name__)) logger_name = ".".join((self.__class__.__module__, self.__class__.__name__))
self.logger = logging.getLogger(logger_name) self.logger = logging.getLogger(logger_name)
@property
def state_dir(self):
return self.options.state_dir
def register_hints(self, hint_parser): # pragma: no cover def register_hints(self, hint_parser): # pragma: no cover
"""Register new hints that this policy accepts """Register new hints that this policy accepts
@ -299,7 +303,7 @@ class AgePolicy(BasePolicy):
fallback_filename = os.path.join(self.suite_info.target_suite.path, 'Dates') fallback_filename = os.path.join(self.suite_info.target_suite.path, 'Dates')
using_new_name = False using_new_name = False
try: try:
filename = os.path.join(self.options.state_dir, 'age-policy-dates') filename = os.path.join(self.state_dir, 'age-policy-dates')
if not os.path.exists(filename) and os.path.exists(fallback_filename): if not os.path.exists(filename) and os.path.exists(fallback_filename):
filename = fallback_filename filename = fallback_filename
else: else:
@ -337,7 +341,7 @@ class AgePolicy(BasePolicy):
min_days_default = self._min_days_default min_days_default = self._min_days_default
fallback_filename = os.path.join(self.suite_info.target_suite.path, 'Urgency') fallback_filename = os.path.join(self.suite_info.target_suite.path, 'Urgency')
try: try:
filename = os.path.join(self.options.state_dir, 'age-policy-urgencies') filename = os.path.join(self.state_dir, 'age-policy-urgencies')
if not os.path.exists(filename) and os.path.exists(fallback_filename): if not os.path.exists(filename) and os.path.exists(fallback_filename):
filename = fallback_filename filename = fallback_filename
except AttributeError: except AttributeError:
@ -381,7 +385,7 @@ class AgePolicy(BasePolicy):
def _write_dates_file(self): def _write_dates_file(self):
dates = self._dates dates = self._dates
try: try:
directory = self.options.state_dir directory = self.state_dir
basename = 'age-policy-dates' basename = 'age-policy-dates'
old_file = os.path.join(self.suite_info.target_suite.path, 'Dates') old_file = os.path.join(self.suite_info.target_suite.path, 'Dates')
except AttributeError: except AttributeError:
@ -433,8 +437,8 @@ class RCBugPolicy(BasePolicy):
fallback_unstable = os.path.join(source_suite.path, 'BugsV') fallback_unstable = os.path.join(source_suite.path, 'BugsV')
fallback_testing = os.path.join(target_suite.path, 'BugsV') fallback_testing = os.path.join(target_suite.path, 'BugsV')
try: try:
filename_unstable = os.path.join(self.options.state_dir, 'rc-bugs-%s' % source_suite.name) filename_unstable = os.path.join(self.state_dir, 'rc-bugs-%s' % source_suite.name)
filename_testing = os.path.join(self.options.state_dir, 'rc-bugs-%s' % target_suite.name) filename_testing = os.path.join(self.state_dir, 'rc-bugs-%s' % target_suite.name)
if not os.path.exists(filename_unstable) and not os.path.exists(filename_testing) and \ if not os.path.exists(filename_unstable) and not os.path.exists(filename_testing) and \
os.path.exists(fallback_unstable) and os.path.exists(fallback_testing): os.path.exists(fallback_unstable) and os.path.exists(fallback_testing):
filename_unstable = fallback_unstable filename_unstable = fallback_unstable
@ -560,8 +564,8 @@ class PiupartsPolicy(BasePolicy):
source_suite = self.suite_info.primary_source_suite source_suite = self.suite_info.primary_source_suite
target_suite = self.suite_info.target_suite target_suite = self.suite_info.target_suite
try: try:
filename_unstable = os.path.join(self.options.state_dir, 'piuparts-summary-%s.json' % source_suite.name) filename_unstable = os.path.join(self.state_dir, 'piuparts-summary-%s.json' % source_suite.name)
filename_testing = os.path.join(self.options.state_dir, 'piuparts-summary-%s.json' % target_suite.name) filename_testing = os.path.join(self.state_dir, 'piuparts-summary-%s.json' % target_suite.name)
except AttributeError as e: # pragma: no cover except AttributeError as e: # pragma: no cover
raise RuntimeError("Please set STATE_DIR in the britney configuration") from e raise RuntimeError("Please set STATE_DIR in the britney configuration") from e
self._piuparts['source'] = self._read_piuparts_summary(filename_unstable, keep_url=True) self._piuparts['source'] = self._read_piuparts_summary(filename_unstable, keep_url=True)