Commit 070cb90b authored by Jens Jørgen Mortensen's avatar Jens Jørgen Mortensen
Browse files

Return folder + name for active tasks

parent 984f436c

myqueue/test/mq_test.py

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ def test_hold_release(mq): 
    assert mq.wait() == 'h'

    (name, state), = get_states_of_active_tasks().items()

    assert state == 'h'

    assert name.endswith('shell:echo+hello')

    assert name == './shell:echo+hello'



    mq('modify -s h -N q . -z')

    mq('modify -s h -N q .')

myqueue/utils.py

+4 −2
Original line number Diff line number Diff line
@@ -307,8 +307,10 @@ def get_states_of_active_tasks(folder: Path = None) -> dict[str, str]: 
    config = Configuration.read(folder)

    with Queue(config, need_lock=False) as queue:

        active = queue.sql(

            'SELECT name, state FROM tasks WHERE state IN ("q", "h", "r")')

        return dict(active)  # type: ignore

            'SELECT folder, name, state FROM tasks '

            'WHERE state IN ("q", "h", "r")')

        return {folder + name: state

                for folder, name, state in active}





if __name__ == '__main__':  # pragma: no cover