diff --git a/pyros.py b/pyros.py index e724f37..02cc789 100755 --- a/pyros.py +++ b/pyros.py @@ -473,8 +473,10 @@ def pyros_launcher(debug, sim, test, verbose): @pyros_launcher.command(help="Run a pyros shell (django included)") # @global_test_options def shell(): + os.environ["PATH_TO_OBSCONF_FOLDER"] = os.path.join(os.path.abspath( + PYROS_DJANGO_BASE_DIR), "../../../privatedev/config/default/") os.environ["PATH_TO_OBSCONF_FILE"] = os.path.join(os.path.abspath( - PYROS_DJANGO_BASE_DIR), "obsconfig/fixtures/observatory_configuration_ok_simple.yml") + PYROS_DJANGO_BASE_DIR), os.environ["PATH_TO_OBSCONF_FOLDER"] + "observatory_default.yml") print("Execution commande shell") print("NAME IS", __name__) print() @@ -722,10 +724,10 @@ def test(app, function): PYROS_DJANGO_BASE_DIR), "../../../config/pyros/", configfile) # start_dir = os.getcwd() if app == None: - # apps = ['obsconfig','scientific_program','common', 'scheduler', 'routine_manager', 'user_manager', 'alert_manager.tests.TestStrategyChange'] + # apps = ['obsconfig','scientific_program','common', 'scheduler', 'routine_manager', 'user_mgmt', 'alert_manager.tests.TestStrategyChange'] # Removing alert_manager, scheduler from tests apps = ['obsconfig', "scientific_program", - 'common', 'user_manager', 'routine_manager','api'] + 'common', 'user_mgmt', 'routine_manager','api'] else: os.environ["PATH_TO_OBSCONF_FILE"] = os.path.join(os.path.abspath( PYROS_DJANGO_BASE_DIR), "obsconfig/fixtures/observatory_configuration_ok_simple.yml") -- libgit2 0.21.2