From 80d4eee0750ddd5cf3fa5a85b458f6ecd30564a7 Mon Sep 17 00:00:00 2001
From: Quinn Capen <qcapen@gmail.com>
Date: Mon, 10 Apr 2017 08:17:13 -0600
Subject: [PATCH] Added asset loading test for sub-folders

---
 .../config/test_asset_loading.yaml            |  36 +++++++++---------
 .../images/preload/subfolder/image14.png      | Bin 0 -> 99 bytes
 mpfmc/tests/test_Assets.py                    |   5 +++
 3 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 mpfmc/tests/machine_files/assets_and_image/images/preload/subfolder/image14.png

diff --git a/mpfmc/tests/machine_files/assets_and_image/config/test_asset_loading.yaml b/mpfmc/tests/machine_files/assets_and_image/config/test_asset_loading.yaml
index 3d25c12f..d2aad642 100644
--- a/mpfmc/tests/machine_files/assets_and_image/config/test_asset_loading.yaml
+++ b/mpfmc/tests/machine_files/assets_and_image/config/test_asset_loading.yaml
@@ -28,38 +28,38 @@ image_pools:
   group1:
     load: preload
     images:
-      image1
-      image2
-      image3
+      - image1
+      - image2
+      - image3
     type: random
   group2:
     load: preload
     images:
-      image1
-      image2
-      image3|2
+      - image1
+      - image2
+      - image3|2
     type: random
   group3:
     images:
-      image1
-      image2
-      image3
+      - image1
+      - image2
+      - image3
     type: sequence
   group4:
     images:
-      image1|4
-      image2|2
-      image3
+      - image1|4
+      - image2|2
+      - image3
     type: sequence
   group5:
     images:
-      image1|1
-      image2|5
-      image3|1
+      - image1|1
+      - image2|5
+      - image3|1
     type: random_force_next
   group6:
     images:
-      image1
-      image2
-      image3
+      - image1
+      - image2
+      - image3
     type: random_force_all
diff --git a/mpfmc/tests/machine_files/assets_and_image/images/preload/subfolder/image14.png b/mpfmc/tests/machine_files/assets_and_image/images/preload/subfolder/image14.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccc01abbd6d876c65140439c01393ef1cf4ba154
GIT binary patch
literal 99
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ih<F90v^-rLLnJOI|HwVu#%>s(SIg>o
wQFI2!jK)Kbi4C42e0g_gv<YvR%_YaoV9wBf{;d7wR-i5hPgg&ebxsLQ0A<V@8~^|S

literal 0
HcmV?d00001

diff --git a/mpfmc/tests/test_Assets.py b/mpfmc/tests/test_Assets.py
index cf3d61af..290aa7b6 100644
--- a/mpfmc/tests/test_Assets.py
+++ b/mpfmc/tests/test_Assets.py
@@ -30,6 +30,9 @@ def test_machine_wide_asset_loading(self):
         # test images from subfolder not listed in assets:images
         self.assertIn('image11', self.mc.images)  # /images/custom1
 
+        # test subfolder under another subfolder listed in assets:images
+        self.assertIn('image14', self.mc.images)  # /images/preload/subfolder
+
         # test images from the images: section that have names configured to be
         # different from their file names
         self.assertIn('image_12_new_name', self.mc.images)  # image12.png
@@ -47,6 +50,8 @@ def test_machine_wide_asset_loading(self):
         # asset was in
         self.assertEqual(self.mc.images['image4'].config['test_key'],
                          'test_value')
+        self.assertEqual(self.mc.images['image14'].config['test_key'],
+                         'test_value')
 
         # test custom k/v pair from asset entry in the images: section
         self.assertEqual(self.mc.images['image3'].config['test_key'],