Merge branch 'main' into test_under_slurm

pitt-crc · Oct 17, 2023 · 78374bd · 78374bd
2 parents d537e40 + 7b5291d
commit 78374bd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 128 deletions.
diff --git a/shinigami/cli.py b/shinigami/cli.py
@@ -59,14 +59,14 @@ def __init__(self) -> None:
         scan = subparsers.add_parser('scan', parents=[common], help='terminate processes on one or more clusters')
         scan.set_defaults(callable=Application.scan)
         scan.add_argument('-c', '--clusters', nargs='+', required=True, help='cluster names to scan')
-        scan.add_argument('-i', '--ignore-nodes', nargs='*', help='ignore given nodes')
-        scan.add_argument('-u', '--uid-whitelist', nargs='+', type=loads, required=True, help='user IDs to scan')
+        scan.add_argument('-i', '--ignore-nodes', nargs='*', default=[], help='ignore given nodes')
+        scan.add_argument('-u', '--uid-whitelist', nargs='+', type=loads, default=[0], help='user IDs to scan')
 
         # Subparser for the `Application.terminate` method
         terminate = subparsers.add_parser('terminate', parents=[common], help='terminate processes on a single node')
         terminate.set_defaults(callable=Application.terminate)
         terminate.add_argument('-n', '--nodes', nargs='+', required=True, help='the DNS name of the node to terminate')
-        terminate.add_argument('-u', '--uid-whitelist', nargs='+', type=loads, required=True, help='user IDs to scan')
+        terminate.add_argument('-u', '--uid-whitelist', nargs='+', type=loads, default=[0], help='user IDs to scan')
 
 
 class Application:

diff --git a/shinigami/settings.py b/shinigami/settings.py
diff --git a/tests/settings/__init__.py b/tests/settings/__init__.py
diff --git a/tests/settings/test_settings.py b/tests/settings/test_settings.py