[oar2trace] (wip)

oar/cli/oar2trace.py

@@ -22,6 +22,7 @@
 import click
 from sqlalchemy.sql import distinct, func, or_
 
+from oar.lib.globals import init_oar
 from oar.lib.models import AssignedResource, Job, MoldableJobDescription, Resource
 
 click.disable_unicode_literals_warning = True
@@ -525,8 +526,6 @@ def cli(
     oar2trace --db-url 'postgresql://oar:oar@server/oar' -m owf
 
     """
-    # import pdb; pdb.set_trace()
-
     display = p
     jobids_range = None
 
@@ -539,9 +538,10 @@ def cli(
         db_name = db_url.split("/")[-1]
         db_server = (db_url.split("/")[-2]).split("@")[-1]
     else:
-        db_name = "oar"
-        db_server = "localhost"
-
+        _, engine = init_oar()
+        session_factory = sessionmaker(bind=engine)
+        scoped = scoped_session(session_factory)
+        session = scoped()
     try:
         jobids_range = db.query(
             func.max(Job.id).label("max"), func.min(Job.id).label("min")

tests/cli/test_oar2trace.py

@@ -7,7 +7,7 @@
 from oar.kao.meta_sched import meta_schedule
 from oar.lib.database import ephemeral_session
 from oar.lib.job_handling import insert_job, set_job_state
-from oar.lib.models import Resource
+from oar.lib.models import Job, Resource
 
 NB_NODES = 5
 
@@ -37,17 +37,14 @@ def test_oar2trace_void(minimal_db_initialization, setup_config):
 @pytest.mark.skip(reason="wip (not working)")
 def test_oar2trace_simple(minimal_db_initialization, setup_config):
     config, _ = setup_config
-    insert_job(res=[(100, [("resource_id=3", "")])])
+    insert_job(minimal_db_initialization, res=[(100, [("resource_id=3", "")])])
 
-    meta_schedule("internal")
-    job = db["Job"].query.one()
+    meta_schedule(minimal_db_initialization, config)
 
-    set_job_state(job.id, "Terminated")
+    job = minimal_db_initialization.query(Job).one()
+
+    set_job_state(minimal_db_initialization, config, job.id, "Terminated")
 
     runner = CliRunner()
     result = runner.invoke(cli, ["-p"])
     assert result.exit_code == 0
-
-    import pdb
-
-    pdb.set_trace()