diff options
| author | Zygmunt Krynicki <zygmunt.krynicki@canonical.com> | 2015-03-07 10:00:22 +0100 |
|---|---|---|
| committer | Zygmunt Krynicki <zygmunt.krynicki@canonical.com> | 2015-03-07 10:00:22 +0100 |
| commit | 4ba11e8ca458ef60468e2588ca03009218956ce7 (patch) | |
| tree | 3ab7a67ab2e1986fa776e5dfc0e7f090eb3f866e /jobs | |
| parent | 5a0125ed7bcfb4697477bf3d96597fc067236994 (diff) | |
providers:checkbox: fix staging/disk/stats_{name}
This patch corrects the prior correction to the staging/disk/stats_{name} template. The original intent was to prevent instantiation of this template from devices that lack the ``name`` attribute. This cannot be done by actually using the {name} expansion in the requires: field as that field is a part of the expansion. Instead, the ``template-filter`` can be used to require a non-empty ``name``. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/disk.txt.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/jobs/disk.txt.in b/jobs/disk.txt.in index 1fd3041..242731a 100644 --- a/jobs/disk.txt.in +++ b/jobs/disk.txt.in @@ -8,11 +8,10 @@ unit: template template-unit: job template-imports: from 2013.com.canonical.certification import device template-resource: device -template-filter: device.category == 'DISK' +template-filter: device.category == 'DISK' and device.name != '' plugin: shell id: staging/disk/stats_{name} requires: - device.name != '' block_device.{name}_state != 'removable' user: root command: disk_stats_test {name} |
