From e8f94277500d46eeb7313e0778ba2f9d3a3bf63b Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Mon, 26 Jul 2021 10:57:01 -0400
Subject: [PATCH] Move testing tracks into data/

And the generate_tracks.py script into tools/

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 Makefile                            | 20 ++++----------------
 audio/test_player.py                |  2 +-
 lib/test_metadata.py                |  2 +-
 sidebar/test_library.py             |  2 +-
 test_trackdb.py                     |  2 +-
 {trier => tools}/generate_tracks.py |  6 +++---
 trackdb/test_allocator.py           |  2 +-
 trackdb/test_track.py               |  2 +-
 8 files changed, 13 insertions(+), 25 deletions(-)
 rename {trier => tools}/generate_tracks.py (97%)

diff --git a/Makefile b/Makefile
index 481d6bd..de117a2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,22 +2,10 @@
 
 clean:
 	find . -type d -name __pycache__ -exec rm -r {} \+
-	find trier -type d -name "Test Album" -exec rm -r {} \+
-	find trier -type d -name "Test Library" -exec rm -r {} \+
-
-.PHONY: trier
-trier:
-	python trier/generate_tracks.py
-	EMMENTAL_TESTING=1 python -m unittest discover -v
+	find data/ -type d -name "Test Album" -exec rm -r {} \+
+	find data/ -type d -name "Test Library" -exec rm -r {} \+
 
 .PHONY: tests
 tests:
-	python trier/generate_tracks.py
-	find `pwd` -name 'test_*.py' -not -path '*/curds/*' -not -path '*/rind/*' -not -path '*test_emmental.py' \
-		| EMMENTAL_TESTING=1 xargs python -m unittest -v
-
-.PHONY:cover
-cover:
-	python trier/generate_tracks.py
-	EMMENTAL_TESTING=1 coverage run -m unittest discover -v
-	coverage report -m
+	python tools/generate_tracks.py
+	EMMENTAL_TESTING=1 python -m unittest discover -v
diff --git a/audio/test_player.py b/audio/test_player.py
index a04ba20..e3920ec 100644
--- a/audio/test_player.py
+++ b/audio/test_player.py
@@ -11,7 +11,7 @@ import pathlib
 import trackdb
 import unittest
 
-test_album = pathlib.Path("./trier/Test Album/")
+test_album = pathlib.Path("./data/Test Album/")
 test_track = test_album / "01 - Test Track.ogg"
 
 
diff --git a/lib/test_metadata.py b/lib/test_metadata.py
index 13aa3e0..52d050b 100644
--- a/lib/test_metadata.py
+++ b/lib/test_metadata.py
@@ -3,7 +3,7 @@ from . import metadata
 import pathlib
 import unittest
 
-test_tracks  = pathlib.Path("./trier/Test Album")
+test_tracks  = pathlib.Path("./data/Test Album")
 track_01 = test_tracks / "01 - Test Track.ogg"
 track_02 = test_tracks / "02 - Test {Disc 2}.ogg"
 
diff --git a/sidebar/test_library.py b/sidebar/test_library.py
index 96a6cbe..75e9438 100644
--- a/sidebar/test_library.py
+++ b/sidebar/test_library.py
@@ -7,7 +7,7 @@ import trackdb
 import unittest
 
 main_context = GLib.main_context_default()
-test_library = pathlib.Path("./trier/Test Library").absolute()
+test_library = pathlib.Path("./data/Test Library").absolute()
 test_artist1 = test_library / "Test Artist 01"
 
 class TestLibrarySidebar(unittest.TestCase):
diff --git a/test_trackdb.py b/test_trackdb.py
index c079811..1064d93 100644
--- a/test_trackdb.py
+++ b/test_trackdb.py
@@ -4,7 +4,7 @@ import pathlib
 import trackdb
 import unittest
 
-test_tracks = pathlib.Path("./trier/Test Album")
+test_tracks = pathlib.Path("./data/Test Album")
 
 class TestLibraryTag(unittest.TestCase):
     def tearDown(self):
diff --git a/trier/generate_tracks.py b/tools/generate_tracks.py
similarity index 97%
rename from trier/generate_tracks.py
rename to tools/generate_tracks.py
index 9d4e211..f1ded14 100644
--- a/trier/generate_tracks.py
+++ b/tools/generate_tracks.py
@@ -6,7 +6,7 @@ import mutagen.id3
 import os
 import subprocess
 
-trier  = os.path.abspath("trier")
+data   = os.path.abspath("data")
 ffmpeg = "ffmpeg -hide_banner -nostdin -f s16le -i /dev/zero -codec libvorbis -loglevel warning".split()
 
 image = mutagen.flac.Picture()
@@ -21,7 +21,7 @@ image_data   = encoded_data.decode("ascii")
 
 
 def generate_track(length, filename, tags={}):
-    path = os.path.join(trier, filename)
+    path = os.path.join(data, filename)
     if os.path.exists(path):
         return
     os.makedirs(os.path.dirname(path), exist_ok=True)
@@ -74,7 +74,7 @@ generate_track(60, "Test Album/11 - Test Track 11.ogg", { "Title" : "Test Track
                                                           "album" : "Test Album 11",
                                                           "discnumber"  : "1",
                                                           "tracknumber" : "11" })
-with open(os.path.join(trier, "Test Album/text.txt"), 'w') as f:
+with open(os.path.join(data, "Test Album/text.txt"), 'w') as f:
     f.write("Test Text")
 
 # Create a giant library for testing
diff --git a/trackdb/test_allocator.py b/trackdb/test_allocator.py
index 7499f61..0344f34 100644
--- a/trackdb/test_allocator.py
+++ b/trackdb/test_allocator.py
@@ -5,7 +5,7 @@ import pathlib
 import threading
 import unittest
 
-test_tracks = pathlib.Path("./trier/Test Album")
+test_tracks = pathlib.Path("./data/Test Album")
 
 class FakeLibrary:
     def __init__(self):
diff --git a/trackdb/test_track.py b/trackdb/test_track.py
index e5d9792..e2082ab 100644
--- a/trackdb/test_track.py
+++ b/trackdb/test_track.py
@@ -7,7 +7,7 @@ import datetime
 import pathlib
 import unittest
 
-test_tracks  = pathlib.Path("./trier/Test Album")
+test_tracks  = pathlib.Path("./data/Test Album")
 
 class FakeLibrary:
     def __init__(self):