From b4bc450518e80538cde7b043e6cecc6ddf214e50 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 9 Sep 2015 17:50:46 +0100
Subject: [PATCH] Make all tests' names and filenames match up

Differential Revision: https://phabricator.apertis.org/D412
Reviewed-by: xclaesse
---
 dbus/{dos-reply-time.yaml => dbus-dos-reply-time.yaml}   | 0
 dbus/{installed-tests.yaml => dbus-installed-tests.yaml} | 0
 predeployed-misc/dist-upgrade.yaml                       | 2 +-
 templates/group-common-tpl.json                          | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename dbus/{dos-reply-time.yaml => dbus-dos-reply-time.yaml} (100%)
 rename dbus/{installed-tests.yaml => dbus-installed-tests.yaml} (100%)

diff --git a/dbus/dos-reply-time.yaml b/dbus/dbus-dos-reply-time.yaml
similarity index 100%
rename from dbus/dos-reply-time.yaml
rename to dbus/dbus-dos-reply-time.yaml
diff --git a/dbus/installed-tests.yaml b/dbus/dbus-installed-tests.yaml
similarity index 100%
rename from dbus/installed-tests.yaml
rename to dbus/dbus-installed-tests.yaml
diff --git a/predeployed-misc/dist-upgrade.yaml b/predeployed-misc/dist-upgrade.yaml
index ece54d4..6d1418a 100644
--- a/predeployed-misc/dist-upgrade.yaml
+++ b/predeployed-misc/dist-upgrade.yaml
@@ -1,5 +1,5 @@
 metadata:
-  name: setup-ping
+  name: dist-upgrade
   format: "Lava-Test-Shell Test Definition 1.0"
   description: "Run a dist-upgrade on the pre-deployed image"
   maintainer: "sjoerd.simons@collabora.co.uk"
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index 1e02455..c6a7f5d 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -138,7 +138,7 @@
           {
             "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
             "revision": "master",
-            "testdef": "dbus/installed-tests.yaml"
+            "testdef": "dbus/dbus-installed-tests.yaml"
           },
           {
             "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
@@ -161,7 +161,7 @@
           {
             "git-repo": "https://lavagit:uT0ahxeiaiD5nie7@git.apertis.org/git/apertis-tests.git",
             "revision": "master",
-            "testdef": "dbus/dos-reply-time.yaml"
+            "testdef": "dbus/dbus-dos-reply-time.yaml"
           }
         ]
       }
-- 
GitLab