Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions pyslurm/pyslurm.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -1985,7 +1985,7 @@ cdef class job:
apiError = slurm.slurm_get_errno()
raise ValueError(slurm.stringOrNone(slurm.slurm_strerror(apiError), ''), apiError)

cpdef find_user(self, user):
def find_user(self, user):
u"""Retrieve a user's job data.

This method calls slurm_load_job_user to get all job_table records
Expand All @@ -1999,14 +1999,12 @@ cdef class job:
int apiError
int rc
uint32_t uid
char *username

if isinstance(user, str):
try:
username = user
uid = getpwnam(username)[2]
uid = getpwnam(user).pw_uid
except KeyError:
raise KeyError("user " + user + " not found")
raise KeyError("user %s not found on this system." % user)
else:
uid = user

Expand Down
20 changes: 20 additions & 0 deletions tests/test-job.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from __future__ import absolute_import, unicode_literals

import pyslurm
import sys
import time

from nose.tools import assert_equals, assert_true, assert_false

from common import scontrol_show
Expand Down Expand Up @@ -79,6 +81,24 @@ def test_job_scontrol():
assert_equals(test_job_info["work_dir"], sctl_dict["WorkDir"])


def test_job_find_user_string():
"""Job: Test job().find_user() (String)."""
user = "root"

if sys.version_info < (3,0):
user = user.encode("UTF-8")

test_job_output = pyslurm.job().find_user(user)
assert_true(isinstance(test_job_output, dict))


def test_job_find_user_int():
"""Job: Test job().find_user() (Integer)."""
user = 0
test_job_output = pyslurm.job().find_user(user)
assert_true(isinstance(test_job_output, dict))


def test_job_kill():
"""Job: Test job().slurm_kill_job()."""
test_job_search_before = pyslurm.job().find(name="name", val="pyslurm_test_job")
Expand Down