← Back to branch summary

~pieq/checkbox/add-30suspend-1reboot-cycles-support

« back to all changes in this revision

Viewing changes to plainbox/plainbox/impl/unit/job.py

  • Committer: Daniel Manrique
  • Author(s): Zygmunt Krynicki
  • Date: 2015-09-22 08:20:21 UTC
  • mfrom: (4021.1.1 launchpad/simple-jobs)
  • Revision ID: daniel_manrique-20150922082021-qg5q4okgrvckxf1y
"automatic merge of lp:~zyga/checkbox/simple-jobs/ by tarmac [r=sylvain-pineau][bug=][author=zyga]"

Show diffs side-by-side

added added

removed removed

Lines of Context:
plainbox/plainbox/impl/unit/job.py
253
253
 
254
254
    @propertywithsymbols(symbols=_PluginValues)
255
255
    def plugin(self):
256
 
        return self.get_record_value('plugin')
 
256
        plugin = self.get_record_value('plugin')
 
257
        if plugin is None and 'simple' in self.get_flag_set():
 
258
            plugin = 'shell'
 
259
        return plugin
257
260
 
258
261
    @property
259
262
    def summary(self):
721
724
                    severity=Severity.advice,
722
725
                    message=_("all jobs should have a description field, or a "
723
726
                              "set of purpose, steps and verification fields"),
724
 
                    onlyif=lambda unit: unit.plugin != 'manual'
725
 
                    and (unit.purpose is None and unit.steps is None and
726
 
                         unit.verification is None)),
 
727
                    onlyif=lambda unit: (
 
728
                        'simple' not in unit.get_flag_set() and
 
729
                        unit.plugin != 'manual' and (
 
730
                            unit.purpose is None and
 
731
                            unit.steps is None and
 
732
                            unit.verification is None))),
727
733
            ],
728
734
            fields.purpose: [
729
735
                TranslatableFieldValidator,
779
785
            fields.estimated_duration: [
780
786
                UntranslatableFieldValidator,
781
787
                TemplateInvariantFieldValidator,
782
 
                PresentFieldValidator(severity=Severity.advice),
 
788
                PresentFieldValidator(
 
789
                    severity=Severity.advice,
 
790
                    onlyif=lambda unit: 'simple' not in unit.get_flag_set()
 
791
                ),
783
792
                CorrectFieldValueValidator(
784
793
                    lambda duration: float(duration) > 0,
785
794
                    message="value must be a positive number",
867
876
                TemplateInvariantFieldValidator,
868
877
                CorrectFieldValueValidator(
869
878
                    lambda value, unit: (
 
879
                        'simple' in unit.get_flag_set() or
870
880
                        'preserve-locale' in unit.get_flag_set()),
871
881
                    Problem.expected_i18n, Severity.advice,
872
882
                    message=_(