From d73fe4bb20e544443476ebb4c9fc593fa0a8ad4a Mon Sep 17 00:00:00 2001 From: Viljami Ilola <+@hix.fi> Date: Sat, 27 Apr 2024 02:20:46 +0300 Subject: fix tests --- src/sliceitoff/settings/settings.py | 6 ++++-- src/sliceitoff/sfx/sfx.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/sliceitoff/settings/settings.py b/src/sliceitoff/settings/settings.py index 19cca7d..2d4b28f 100644 --- a/src/sliceitoff/settings/settings.py +++ b/src/sliceitoff/settings/settings.py @@ -3,12 +3,14 @@ import os from pathlib import Path from .static import DEFAULT_SETTINGS +TEST_CONFIG_FILE = os.getenv("TEST_CONFIG_FILE") + class Settings: """ Handles loading and saving settings from config file""" def __init__(self, filename = None): self.settings=[] - if filename: - self.config_filename = filename + if TEST_CONFIG_FILE: + self.config_filename = Path(TEST_CONFIG_FILE) else: if os.name == 'nt': self.config_filename = (Path.home().resolve() diff --git a/src/sliceitoff/sfx/sfx.py b/src/sliceitoff/sfx/sfx.py index 8f3371e..a72df0b 100644 --- a/src/sliceitoff/sfx/sfx.py +++ b/src/sliceitoff/sfx/sfx.py @@ -52,7 +52,8 @@ class Sfx: self.music_volume += 1 self.music_volume %= 11 settings.replace_value("music_volume", self.music_volume) - self.sound[self.bgm].set_volume(self.music_volume / 10) + if self.bgm: + self.sound[self.bgm].set_volume(self.music_volume / 10) def play(self, sample): """ Just plays named sample loaded from assets directory """ -- cgit v1.2.3