summaryrefslogtreecommitdiff
path: root/units
diff options
authorJonathan Cave <jonathan.cave@canonical.com>2020-02-07 12:50:22 +0000
committerJonathan Cave <jonathan.cave@canonical.com>2020-02-07 12:50:22 +0000
commitc270b398e8c798025b2e6e46e3b5ad645c89a689 (patch)
tree21ecf48aaa1678202164cf96c8df55f1d5868da1 /units
parentb39974045b2a8c8e354e29ed52e906cc66d68e41 (diff)
recovery_info: remove guacamole, split out tests
This commit encapsulates changes to: remove guacamole dependency, move out the unit tests to a dedicated script that can be run with the `manage.py tests` framework, and give the script a .py extension to allow importing
Diffstat (limited to 'units')
-rw-r--r--units/info/jobs.pxu8
-rw-r--r--units/submission/jobs.pxu4
2 files changed, 6 insertions, 6 deletions
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index a513deb..48a71df 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -361,7 +361,7 @@ user: root
estimated_duration: 0.2
_summary: Check existence of recovery partition
_description: Check existence of recovery partition
-command: recovery_info
+command: recovery_info.py
plugin: shell
category_id: com.canonical.plainbox::info
@@ -372,7 +372,7 @@ user: root
estimated_duration: 0.2
_summary: Check the recovery type is dell or not
_description: Check the recovery type is dell or not
-command: recovery_info checktype DELL
+command: recovery_info.py checktype DELL
plugin: attachment
category_id: com.canonical.plainbox::info
@@ -389,7 +389,7 @@ _description:
Example:
image_version: somerville-trusty-amd64-20140620-0
bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
-command: recovery_info version
+command: recovery_info.py version
plugin: attachment
category_id: com.canonical.plainbox::info
@@ -404,7 +404,7 @@ _description:
The information include:
- fish packages
- dell recovery stage 2 boot log
-command: recovery_info file bto.xml
+command: recovery_info.py file bto.xml
plugin: attachment
category_id: com.canonical.plainbox::info
diff --git a/units/submission/jobs.pxu b/units/submission/jobs.pxu
index b433fd3..7a9b2aa 100644
--- a/units/submission/jobs.pxu
+++ b/units/submission/jobs.pxu
@@ -62,7 +62,7 @@ _description:
The information include:
- fish packages
- dell recovery stage 2 boot log
-command: recovery_info file bto.xml | python3 -m plainbox dev parse bto
+command: recovery_info.py file bto.xml | python3 -m plainbox dev parse bto
id: recovery_info_attachment_json
plugin: attachment
@@ -79,7 +79,7 @@ _description:
Example:
image_version: somerville-trusty-amd64-20140620-0
bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
-command: recovery_info version | python3 -m plainbox dev parse recovery-info
+command: recovery_info.py version | python3 -m plainbox dev parse recovery-info
id: system_info_json
plugin: attachment