Skip to content

Commit f1b8c0f

Browse files
committed
Correct expert includes new option
1 parent 86795f8 commit f1b8c0f

File tree

1 file changed

+18
-22
lines changed

1 file changed

+18
-22
lines changed

tests/sorcha/test_sorchaConfigs.py

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
import pytest
2-
from sorcha.utilities.sorchaArguments import sorchaArguments
3-
from sorcha.utilities.dataUtilitiesForTests import get_demo_filepath
4-
from sorcha.lightcurves.lightcurve_registration import LC_METHODS
2+
53
from sorcha.activity.activity_registration import CA_METHODS
6-
from sorcha.utilities.sorchaConfigs import (
7-
sorchaConfigs,
8-
inputConfigs,
9-
simulationConfigs,
10-
filtersConfigs,
11-
saturationConfigs,
12-
phasecurvesConfigs,
13-
fovConfigs,
14-
fadingfunctionConfigs,
15-
linkingfilterConfigs,
16-
outputConfigs,
17-
lightcurveConfigs,
18-
activityConfigs,
19-
expertConfigs,
20-
auxiliaryConfigs,
21-
)
4+
from sorcha.lightcurves.lightcurve_registration import LC_METHODS
5+
from sorcha.utilities.dataUtilitiesForTests import get_demo_filepath
6+
from sorcha.utilities.sorchaArguments import sorchaArguments
7+
from sorcha.utilities.sorchaConfigs import (activityConfigs, auxiliaryConfigs,
8+
expertConfigs,
9+
fadingfunctionConfigs,
10+
filtersConfigs, fovConfigs,
11+
inputConfigs, lightcurveConfigs,
12+
linkingfilterConfigs,
13+
outputConfigs, phasecurvesConfigs,
14+
saturationConfigs,
15+
simulationConfigs, sorchaConfigs)
2216

2317
# these are the results we expect from sorcha_config_demo.ini
2418
correct_inputs = {
@@ -105,6 +99,7 @@
10599
"randomization_on": True,
106100
"vignetting_on": True,
107101
"brute_force": True,
102+
"ar_use_integrate": False,
108103
}
109104

110105
correct_auxciliary_URLs = {
@@ -1072,11 +1067,12 @@ def test_auxiliary_config_making_url_none(file):
10721067

10731068

10741069
def test_PrintConfigsToLog(tmp_path):
1070+
import glob
1071+
import os
1072+
10751073
from sorcha.modules.PPGetLogger import PPGetLogger
1076-
from sorcha.utilities.sorchaConfigs import PrintConfigsToLog
10771074
from sorcha.utilities.dataUtilitiesForTests import get_test_filepath
1078-
import os
1079-
import glob
1075+
from sorcha.utilities.sorchaConfigs import PrintConfigsToLog
10801076

10811077
test_path = os.path.dirname(get_test_filepath("test_input_fullobs.csv"))
10821078
config_file_location = get_test_filepath("test_PPConfig.ini")

0 commit comments

Comments
 (0)