PYROS-IRAP / pyros

Commit 2f2d3dd77843a5b59c59a51c0bb629b174bc5b49

Authored by Alexis Koralewski
1 parent 9e50e041
Exists in dev

fix pyros shell command

Showing 1 changed file with 5 additions and 3 deletions   Show diff stats
Inline Side-by-side
pyros.py
  Diff comments   View file @2f2d3dd
... ... @@ -473,8 +473,10 @@ def pyros_launcher(debug, sim, test, verbose):
473 473 @pyros_launcher.command(help="Run a pyros shell (django included)")
474 474 # @global_test_options
475 475 def shell():
  476 + os.environ["PATH_TO_OBSCONF_FOLDER"] = os.path.join(os.path.abspath(
  477 + PYROS_DJANGO_BASE_DIR), "../../../privatedev/config/default/")
476 478 os.environ["PATH_TO_OBSCONF_FILE"] = os.path.join(os.path.abspath(
477   - PYROS_DJANGO_BASE_DIR), "obsconfig/fixtures/observatory_configuration_ok_simple.yml")
  479 + PYROS_DJANGO_BASE_DIR), os.environ["PATH_TO_OBSCONF_FOLDER"] + "observatory_default.yml")
478 480 print("Execution commande shell")
479 481 print("NAME IS", __name__)
480 482 print()
... ... @@ -722,10 +724,10 @@ def test(app, function):
722 724 PYROS_DJANGO_BASE_DIR), "../../../config/pyros/", configfile)
723 725 # start_dir = os.getcwd()
724 726 if app == None:
725   - # apps = ['obsconfig','scientific_program','common', 'scheduler', 'routine_manager', 'user_manager', 'alert_manager.tests.TestStrategyChange']
  727 + # apps = ['obsconfig','scientific_program','common', 'scheduler', 'routine_manager', 'user_mgmt', 'alert_manager.tests.TestStrategyChange']
726 728 # Removing alert_manager, scheduler from tests
727 729 apps = ['obsconfig', "scientific_program",
728   - 'common', 'user_manager', 'routine_manager','api']
  730 + 'common', 'user_mgmt', 'routine_manager','api']
729 731 else:
730 732 os.environ["PATH_TO_OBSCONF_FILE"] = os.path.join(os.path.abspath(
731 733 PYROS_DJANGO_BASE_DIR), "obsconfig/fixtures/observatory_configuration_ok_simple.yml")
... ...