diff --git a/tests/conftest.py b/tests/conftest.py index a8632d356..ba9b4de7b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,14 +10,16 @@ "tests.fixtures.motor.hybrid_fixtures", "tests.fixtures.motor.solid_motor_fixtures", "tests.fixtures.motor.liquid_fixtures", + "tests.fixtures.motor.generic_motor_fixtures", "tests.fixtures.parachutes.parachute_fixtures", "tests.fixtures.rockets.rocket_fixtures", "tests.fixtures.surfaces.surface_fixtures", - "tests.fixtures.units.numerical_fixtures" + "tests.fixtures.units.numerical_fixtures", ] # + def pytest_addoption(parser): """Add option to run slow tests. This is used to skip slow tests by default. diff --git a/tests/fixtures/hybrid/hybrid_fixtures.py b/tests/fixtures/hybrid/hybrid_fixtures.py index 471e7a8bf..9c3d8c8dc 100644 --- a/tests/fixtures/hybrid/hybrid_fixtures.py +++ b/tests/fixtures/hybrid/hybrid_fixtures.py @@ -1,9 +1,17 @@ import numpy as np import pytest -from rocketpy import (CylindricalTank, Fluid, Function, HybridMotor, - LevelBasedTank, LiquidMotor, MassBasedTank, - SphericalTank, UllageBasedTank) +from rocketpy import ( + CylindricalTank, + Fluid, + Function, + HybridMotor, + LevelBasedTank, + LiquidMotor, + MassBasedTank, + SphericalTank, + UllageBasedTank, +) @pytest.fixture diff --git a/tests/fixtures/motor/motor_fixtures.py b/tests/fixtures/motor/motor_fixtures.py index ca374164a..f53457d49 100644 --- a/tests/fixtures/motor/motor_fixtures.py +++ b/tests/fixtures/motor/motor_fixtures.py @@ -6,7 +6,6 @@ ## Motors and rockets - @pytest.fixture def cesaroni_m1670(): # old name: solid_motor """Create a simple object of the SolidMotor class to be used in the tests. @@ -141,4 +140,4 @@ def generic_motor(): dry_inertia=(0.2, 0.2, 0.08), ) - return motor \ No newline at end of file + return motor