Merge ~jocave/plainbox-provider-certification-client:pxu-renaming-for-readability into plainbox-provider-certification-client:master

[Jonathan Cave]

Some file renaming in attempt to create clearer organisation. No changes at all to test plan ids or contents in this one.

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/units/client-cert-16-04.pxu b/units/client-cert-desktop-16-04.pxu
similarity index 100%
rename from units/client-cert-16-04.pxu
rename to units/client-cert-desktop-16-04.pxu
diff --git a/units/client-cert-18-04.pxu b/units/client-cert-desktop-18-04.pxu
similarity index 100%
rename from units/client-cert-18-04.pxu
rename to units/client-cert-desktop-18-04.pxu
diff --git a/units/client-cert-20-04.pxu b/units/client-cert-desktop-20-04.pxu
similarity index 100%
rename from units/client-cert-20-04.pxu
rename to units/client-cert-desktop-20-04.pxu
diff --git a/units/client-cert-n+1.pxu b/units/client-cert-desktop-n+1.pxu
similarity index 100%
rename from units/client-cert-n+1.pxu
rename to units/client-cert-desktop-n+1.pxu
diff --git a/units/cdts.pxu b/units/client-drivertest.pxu
similarity index 76%
rename from units/cdts.pxu
rename to units/client-drivertest.pxu
index bc0ec23..31f9843 100644
--- a/units/cdts.pxu
+++ b/units/client-drivertest.pxu
@@ -19,3 +19,15 @@ nested_part:
     com.canonical.certification::dock-cert-full
     com.canonical.certification::after-suspend-dock-cert-full
 
+id: touchpad
+_name: Touchpad Tests
+unit: test plan
+_description:
+ This test plan is used for customers and independent hardware vendors (IHV)
+ to test and verify the behavior of touchpads on tested devices.
+include:
+nested_part:
+    submission-cert-full
+    touchpad-cert-full
+    after-suspend-touchpad-cert-full
+    info-attachment-cert-full
diff --git a/units/touchpad.pxu b/units/touchpad.pxu
deleted file mode 100644
index 6cf44bb..0000000
--- a/units/touchpad.pxu
+++ /dev/null
@@ -1,12 +0,0 @@
-id: touchpad
-_name: Touchpad Tests
-unit: test plan
-_description:
- This test plan is used for customers and independent hardware vendors (IHV)
- to test and verify the behavior of touchpads on tested devices.
-include:
-nested_part:
-    submission-cert-full
-    touchpad-cert-full
-    after-suspend-touchpad-cert-full
-    info-attachment-cert-full