From 6c5c1e735ceeddab1777326b5b8f66639837e02e Mon Sep 17 00:00:00 2001 From: Xevion Date: Mon, 20 Apr 2020 23:53:39 -0500 Subject: [PATCH] fix sprites fixture with simpler nested for loops --- triple-dungeon/tests.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/triple-dungeon/tests.py b/triple-dungeon/tests.py index b5104d5..b66e48c 100644 --- a/triple-dungeon/tests.py +++ b/triple-dungeon/tests.py @@ -4,7 +4,6 @@ A file dedicated to testing our game and ensuring it can run. Integrate this into your IDE's workflow to ensure the game runs from top to bottom. The tests used here should test all of our game's features as best they can. """ -from itertools import chain from typing import Pattern, List import pytest @@ -48,12 +47,11 @@ class TestSprites: BASE_DIR = os.path.dirname(os.path.abspath(__file__)) IMAGE_DIR = os.path.join(BASE_DIR, 'resources', 'images') - primary_folders = os.listdir(IMAGE_DIR) - secondary_folders = \ - chain.from_iterable([os.listdir(os.path.join(IMAGE_DIR, pfolder)) for pfolder in primary_folders])[os.listdir()] - return list( - chain.from_iterable([[os.path.join(IMAGE_DIR, file) for file in os.listdir(os.path.join(IMAGE_DIR, folder)) - ] for folder in os.listdir(IMAGE_DIR)])) + _sprites = [] + for primary in os.listdir(IMAGE_DIR): + for secondary in os.listdir(os.path.join(IMAGE_DIR, primary)): + _sprites.extend(os.listdir(os.path.join(IMAGE_DIR, primary, secondary))) + return _sprites @pytest.fixture def patterns(self) -> List[Pattern]: