Cleaned up helper_file references and file copy debug statements.

BethanyG · BethanyG · commit 62ee658caa13 · 2021-08-26T07:48:29.000-07:00
diff --git a/bin/data.py b/bin/data.py
@@ -194,7 +194,7 @@ def solution_stub(self):
         )
 
     @property
-    def helper_files(self):
+    def helper_file(self):
         return next(self.path.glob("*_data.py"), None)
 
     @property
diff --git a/bin/test_exercises.py b/bin/test_exercises.py
@@ -52,6 +52,12 @@ def copy_solution_files(exercise: ExerciseInfo, workdir: Path, exercise_config:
         exemplar_files = []
         helper_files = []
 
+    if helper_files:
+        helper_files = [exercise.path / h for h in helper_files]
+        for helper_file in helper_files:
+            dst = workdir / helper_file.relative_to(exercise.path)
+            copy_file(helper_file, dst)
+
     if not solution_files:
         solution_files.append(exercise.solution_stub.name)
     solution_files = [exercise.path / s for s in solution_files]
@@ -68,12 +74,6 @@ def copy_solution_files(exercise: ExerciseInfo, workdir: Path, exercise_config:
             dst = workdir / solution_file.relative_to(exercise.path)
             copy_file(exemplar_file, dst)
 
-    if helper_files:
-        helper_files = [exercise.path / h for h in helper_files]
-        for helper_file in helper_files:
-            dist = workdir / helper_file.relative_to(exercise.path)
-            copy_file(helper_file, dist)
-
 
 def copy_test_files(exercise: ExerciseInfo, workdir: Path, exercise_config = None):
     if exercise_config is not None:
@@ -82,6 +82,13 @@ def copy_test_files(exercise: ExerciseInfo, workdir: Path, exercise_config = Non
     else:
         test_files = []
         helper_files = []
+
+    if helper_files:
+        for helper_file_name in helper_files:
+            helper_file = exercise.path / helper_file_name
+            helper_file_out = workdir / helper_file_name
+            copy_file(helper_file, helper_file_out, strip_skips=(exercise.slug not in ALLOW_SKIP))
+
     if not test_files:
         test_files.append(exercise.test_file.name)
 
@@ -90,11 +97,6 @@ def copy_test_files(exercise: ExerciseInfo, workdir: Path, exercise_config = Non
         test_file_out = workdir / test_file_name
         copy_file(test_file, test_file_out, strip_skips=(exercise.slug not in ALLOW_SKIP))
 
-    if helper_files is not None:
-        for helper_file_name in helper_files:
-            helper_file = exercise.path / helper_file_name
-            dst = workdir / helper_file.relative_to(exercise.path)
-            copy_file(helper_file, dst)
 
 def copy_exercise_files(exercise: ExerciseInfo, workdir: Path):
     exercise_config = None

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ def solution_stub(self):`
`194`	`194`	`)`
`195`	`195`
`196`	`196`	`@property`
`197`		`- def helper_files(self):`
	`197`	`+ def helper_file(self):`
`198`	`198`	`return next(self.path.glob("*_data.py"), None)`
`199`	`199`
`200`	`200`	`@property`