From bd5095d0d01d51b83daa27438f2db8ec255252a8 Mon Sep 17 00:00:00 2001
From: Benjamin Sago <ogham@bsago.me>
Date: Fri, 28 Apr 2017 20:07:31 +0100
Subject: [PATCH] Rename file-types tests to file-names-exts

This name more accurately reflects which code is being tested (things like .png and Makefile, rather than pipes and sockets), freeing up file-types for *actual* file types to be tested.
---
 Vagrantfile                            | 48 +++++++++++++-------------
 xtests/{file-types => file-names-exts} |  0
 xtests/ignores_ogg                     |  2 +-
 xtests/run.sh                          |  6 ++--
 4 files changed, 28 insertions(+), 28 deletions(-)
 rename xtests/{file-types => file-names-exts} (100%)

diff --git a/Vagrantfile b/Vagrantfile
index 5468b9c..ed8687e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -102,40 +102,40 @@ Vagrant.configure(2) do |config|
     # owners or timestamps or anything.
     config.vm.provision :shell, privileged: false, inline: <<-EOF
         set -xe
-        mkdir "#{test_dir}/file-types"
+        mkdir "#{test_dir}/file-names-exts"
 
-        touch "#{test_dir}/file-types/Makefile"
+        touch "#{test_dir}/file-names-exts/Makefile"
 
-        touch "#{test_dir}/file-types/image.png"
-        touch "#{test_dir}/file-types/image.svg"
+        touch "#{test_dir}/file-names-exts/image.png"
+        touch "#{test_dir}/file-names-exts/image.svg"
 
-        touch "#{test_dir}/file-types/video.avi"
-        touch "#{test_dir}/file-types/video.wmv"
+        touch "#{test_dir}/file-names-exts/video.avi"
+        touch "#{test_dir}/file-names-exts/video.wmv"
 
-        touch "#{test_dir}/file-types/music.mp3"
-        touch "#{test_dir}/file-types/music.ogg"
+        touch "#{test_dir}/file-names-exts/music.mp3"
+        touch "#{test_dir}/file-names-exts/music.ogg"
 
-        touch "#{test_dir}/file-types/lossless.flac"
-        touch "#{test_dir}/file-types/lossless.wav"
+        touch "#{test_dir}/file-names-exts/lossless.flac"
+        touch "#{test_dir}/file-names-exts/lossless.wav"
 
-        touch "#{test_dir}/file-types/crypto.asc"
-        touch "#{test_dir}/file-types/crypto.signature"
+        touch "#{test_dir}/file-names-exts/crypto.asc"
+        touch "#{test_dir}/file-names-exts/crypto.signature"
 
-        touch "#{test_dir}/file-types/document.pdf"
-        touch "#{test_dir}/file-types/document.xlsx"
+        touch "#{test_dir}/file-names-exts/document.pdf"
+        touch "#{test_dir}/file-names-exts/document.xlsx"
 
-        touch "#{test_dir}/file-types/compressed.zip"
-        touch "#{test_dir}/file-types/compressed.tar.gz"
-        touch "#{test_dir}/file-types/compressed.tgz"
+        touch "#{test_dir}/file-names-exts/compressed.zip"
+        touch "#{test_dir}/file-names-exts/compressed.tar.gz"
+        touch "#{test_dir}/file-names-exts/compressed.tgz"
 
-        touch "#{test_dir}/file-types/backup~"
-        touch "#{test_dir}/file-types/#SAVEFILE#"
-        touch "#{test_dir}/file-types/file.tmp"
+        touch "#{test_dir}/file-names-exts/backup~"
+        touch "#{test_dir}/file-names-exts/#SAVEFILE#"
+        touch "#{test_dir}/file-names-exts/file.tmp"
 
-        touch "#{test_dir}/file-types/compiled.class"
-        touch "#{test_dir}/file-types/compiled.o"
-        touch "#{test_dir}/file-types/compiled.js"
-        touch "#{test_dir}/file-types/compiled.coffee"
+        touch "#{test_dir}/file-names-exts/compiled.class"
+        touch "#{test_dir}/file-names-exts/compiled.o"
+        touch "#{test_dir}/file-names-exts/compiled.js"
+        touch "#{test_dir}/file-names-exts/compiled.coffee"
     EOF
 
 
diff --git a/xtests/file-types b/xtests/file-names-exts
similarity index 100%
rename from xtests/file-types
rename to xtests/file-names-exts
diff --git a/xtests/ignores_ogg b/xtests/ignores_ogg
index d32a8a9..d54732c 100644
--- a/xtests/ignores_ogg
+++ b/xtests/ignores_ogg
@@ -1 +1 @@
-/testcases/file-types/music.mp3
+/testcases/file-names-exts/music.mp3
diff --git a/xtests/run.sh b/xtests/run.sh
index 8e3246a..ac0cba4 100755
--- a/xtests/run.sh
+++ b/xtests/run.sh
@@ -56,12 +56,12 @@ sudo -u cassowary $exa $testcases/permissions -lghR 2>&1 | diff -q - $results/pe
 
 
 # File types
-$exa $testcases/file-types -1 2>&1 | diff -q - $results/file-types  || exit 1
+$exa $testcases/file-names-exts -1 2>&1 | diff -q - $results/file-names-exts  || exit 1
 
 
 # Ignores
-$exa $testcases/file-types/music.* -I "*.ogg"       -1 2>&1 | diff -q - $results/ignores_ogg  || exit 1
-$exa $testcases/file-types/music.* -I "*.ogg|*.mp3" -1 2>&1 | diff -q - $results/empty        || exit 1
+$exa $testcases/file-names-exts/music.* -I "*.ogg"       -1 2>&1 | diff -q - $results/ignores_ogg  || exit 1
+$exa $testcases/file-names-exts/music.* -I "*.ogg|*.mp3" -1 2>&1 | diff -q - $results/empty        || exit 1
 
 
 # Links
-- 
GitLab