[tracker-miners/sam/tracker-3.0-functional-tests: 3/5] functional-tests: Remove numbers from names

[Sam Thursfield <sthursfield src gnome org>]

commit 8c517046277e918f0229a5b318363981a17044b5
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Feb 12 00:42:55 2020 +0100

    functional-tests: Remove numbers from names

 ...tractor-decorator.py => extractor-decorator.py} |  0
 ...flac-cuesheet.py => extractor-flac-cuesheet.py} |  0
 ...-extractor-metadata.py => extractor-generic.py} |  0
 .../{310-fts-basic.py => fts-basic.py}             |  0
 ...s-file-operations.py => fts-file-operations.py} |  0
 .../{312-fts-stopwords.py => fts-stopwords.py}     |  0
 tests/functional-tests/meson.build                 | 39 +++++++---------------
 .../{300-miner-basic-ops.py => miner-basic.py}     |  0
 ...source-removal.py => miner-resource-removal.py} |  0
 .../{502-writeback-audio.py => writeback-audio.py} |  0
 ...image-details.py => writeback-image-details.py} |  0
 ...500-writeback-images.py => writeback-images.py} |  0
 12 files changed, 12 insertions(+), 27 deletions(-)
---
diff --git a/tests/functional-tests/410-extractor-decorator.py b/tests/functional-tests/extractor-decorator.py
similarity index 100%
rename from tests/functional-tests/410-extractor-decorator.py
rename to tests/functional-tests/extractor-decorator.py
diff --git a/tests/functional-tests/401-extractor-flac-cuesheet.py 
b/tests/functional-tests/extractor-flac-cuesheet.py
similarity index 100%
rename from tests/functional-tests/401-extractor-flac-cuesheet.py
rename to tests/functional-tests/extractor-flac-cuesheet.py
diff --git a/tests/functional-tests/400-extractor-metadata.py b/tests/functional-tests/extractor-generic.py
similarity index 100%
rename from tests/functional-tests/400-extractor-metadata.py
rename to tests/functional-tests/extractor-generic.py
diff --git a/tests/functional-tests/310-fts-basic.py b/tests/functional-tests/fts-basic.py
similarity index 100%
rename from tests/functional-tests/310-fts-basic.py
rename to tests/functional-tests/fts-basic.py
diff --git a/tests/functional-tests/311-fts-file-operations.py b/tests/functional-tests/fts-file-operations.py
similarity index 100%
rename from tests/functional-tests/311-fts-file-operations.py
rename to tests/functional-tests/fts-file-operations.py
diff --git a/tests/functional-tests/312-fts-stopwords.py b/tests/functional-tests/fts-stopwords.py
similarity index 100%
rename from tests/functional-tests/312-fts-stopwords.py
rename to tests/functional-tests/fts-stopwords.py
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index 7cada4794..be574f9e9 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -95,27 +95,27 @@ if get_option('unzip_ps_gz_files')
 endif
 
 functional_tests = [
-  '300-miner-basic-ops',
-  '301-miner-resource-removal',
-  '310-fts-basic',
-  '311-fts-file-operations',
-  '312-fts-stopwords',
-  '410-extractor-decorator',
+  'miner-basic',
+  'miner-resource-removal',
+  'fts-basic',
+  'fts-file-operations',
+  'fts-stopwords',
+  'extractor-decorator',
 ]
 
 if libcue.found()
-  functional_tests += '401-extractor-flac-cuesheet'
+  functional_tests += 'extractor-flac-cuesheet'
 endif
 
 if libjpeg.found() and libgif.found() and libpng.found() and libtiff.found() and exempi.found() and 
libexif.found()
   functional_tests += [
-    '500-writeback-images',
-    '501-writeback-image-details',
+    'writeback-images',
+    'writeback-image-details',
   ]
 endif
 
 if libvorbis.found() and flac.found() and generic_media_handler_name != 'none'
-  functional_tests += '502-writeback-audio'
+  functional_tests += 'writeback-audio'
 endif
 
 detect_h264_codec = join_paths(meson.current_source_dir(), 'detect-h264-codec.sh')
@@ -154,7 +154,7 @@ foreach t: extractor_tests
     test_suite = [test_parts[0]]
   endif
   test(test_name, python,
-    args: ['400-extractor-metadata.py', data],
+    args: ['extractor-generic.py', data],
     env: test_env,
     suite: ['extractor'] + test_suite,
     workdir: meson.current_source_dir())
@@ -162,22 +162,7 @@ endforeach
 
 foreach t: functional_tests
   file = '@0@.py'.format(t)
-  test_parts = t.split('-')
-  test_name = t
-  test_suite = []
-  if test_parts.length() > 1
-    test_suite = [test_parts[1]]
-    parts = []
-    i = 0
-    foreach p: test_parts
-      if i > 1
-        parts += p
-      endif
-      i += 1
-    endforeach
-    test_name = '-'.join(parts)
-  endif
-  test(test_name, python,
+  test(t, python,
     args: [file],
     env: test_env,
     workdir: meson.current_source_dir(),
diff --git a/tests/functional-tests/300-miner-basic-ops.py b/tests/functional-tests/miner-basic.py
similarity index 100%
rename from tests/functional-tests/300-miner-basic-ops.py
rename to tests/functional-tests/miner-basic.py
diff --git a/tests/functional-tests/301-miner-resource-removal.py 
b/tests/functional-tests/miner-resource-removal.py
similarity index 100%
rename from tests/functional-tests/301-miner-resource-removal.py
rename to tests/functional-tests/miner-resource-removal.py
diff --git a/tests/functional-tests/502-writeback-audio.py b/tests/functional-tests/writeback-audio.py
similarity index 100%
rename from tests/functional-tests/502-writeback-audio.py
rename to tests/functional-tests/writeback-audio.py
diff --git a/tests/functional-tests/501-writeback-image-details.py 
b/tests/functional-tests/writeback-image-details.py
similarity index 100%
rename from tests/functional-tests/501-writeback-image-details.py
rename to tests/functional-tests/writeback-image-details.py
diff --git a/tests/functional-tests/500-writeback-images.py b/tests/functional-tests/writeback-images.py
similarity index 100%
rename from tests/functional-tests/500-writeback-images.py
rename to tests/functional-tests/writeback-images.py