Commit 37df3157 authored by Ambra Di Piano's avatar Ambra Di Piano
Browse files

rename fixture test_conf_file

parent 7cd7fd09

astrort/testing/test_configure/test_check_configuration.py

+11 −11
Original line number Diff line number Diff line
@@ -10,39 +10,39 @@ import pytest 
from astrort.utils.wrap import load_yaml_conf

from astrort.configure.check_configuration import CheckConfiguration



@pytest.mark.astrort_configuration

@pytest.mark.test_conf_file

class TestCheckConfiguration:



    def test_check(self, astrort_configuration):

        configuration = load_yaml_conf(astrort_configuration)

    def test_check(self, test_conf_file):

        configuration = load_yaml_conf(test_conf_file)

        try:

            CheckConfiguration(configuration=configuration).check()

        except AssertionError as e:

            type(e) == AssertionError



    def test_check_tags(self, astrort_configuration):

        configuration = load_yaml_conf(astrort_configuration)

    def test_check_tags(self, test_conf_file):

        configuration = load_yaml_conf(test_conf_file)

        try:

            CheckConfiguration(configuration=configuration).check_tags()

        except AssertionError as e:

            type(e) == AssertionError



    def test_check_simulator(self, astrort_configuration):

        configuration = load_yaml_conf(astrort_configuration)

    def test_check_simulator(self, test_conf_file):

        configuration = load_yaml_conf(test_conf_file)

        try:

            CheckConfiguration(configuration=configuration).check_simulator()

        except AssertionError as e:

            type(e) == AssertionError



    def test_check_visibility(self, astrort_configuration):

        configuration = load_yaml_conf(astrort_configuration)

    def test_check_visibility(self, test_conf_file):

        configuration = load_yaml_conf(test_conf_file)

        try:

            CheckConfiguration(configuration=configuration).check_visibility()

        except AssertionError as e:

            type(e) == AssertionError



    def test_check_logging(self, astrort_configuration):

        configuration = load_yaml_conf(astrort_configuration)

    def test_check_logging(self, test_conf_file):

        configuration = load_yaml_conf(test_conf_file)

        try:

            CheckConfiguration(configuration=configuration).check_logging()

        except AssertionError as e:

astrort/testing/test_utils/test_utils.py

+3 −3
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ from astrort.utils.utils import * 
def test_seeds_to_string_formatter(samples, astrort_tmp_folder):

    name = seeds_to_string_formatter(samples, astrort_tmp_folder, name='test', seed=1)



    if samples <= 3:

    if samples <= 1e3:

        assert name == f"{astrort_tmp_folder}/test_001.fits"

    elif samples <= 5:

    elif samples <= 1e5:

        assert name == f"{astrort_tmp_folder}/test_00001.fits"

    elif samples <= 8:

    elif samples <= 1e8:

        assert name == f"{astrort_tmp_folder}/test_00000001.fits"

    else:

        assert name == f"{astrort_tmp_folder}/test_1.fits"

astrort/testing/test_utils/test_wrap.py

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
import pytest

from astrort.utils.wrap import load_yaml_conf



@pytest.mark.astrort_configuration

def test_load_yaml_conf(astrort_configuration):

    configuration = load_yaml_conf(astrort_configuration)

@pytest.mark.test_conf_file

def test_load_yaml_conf(test_conf_file):

    configuration = load_yaml_conf(test_conf_file)

    assert type(configuration) == dict
 
 No newline at end of file

astrort/utils/utils.py

+3 −3
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 
from os.path import join



def seeds_to_string_formatter(samples, output, name, seed):

    if samples <= 3:

    if samples <= 1e3:

        name = join(output, f"{name}_{seed:03d}.fits")

    elif samples <= 5:

    elif samples <= 1e5:

        name = join(output, f"{name}_{seed:05d}.fits")

    elif samples <= 8:

    elif samples <= 1e8:

        name = join(output, f"{name}_{seed:08d}.fits")

    else:

        name = join(output, f"{name}_{seed}.fits")