Skip to content

Commit

Permalink
shorter line and passing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Seb Martin committed Apr 9, 2019
1 parent 3a1c237 commit 4196b38
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 17 deletions.
12 changes: 8 additions & 4 deletions pyoozie/client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,12 @@ def jobs_all_workflows(self, name=None, user=None, limit=0):
return self._jobs_query(model.ArtifactType.Workflow, name=name, user=user, limit=limit)

def jobs_all_active_workflows(self, user=None, details=True):
return self._jobs_query(model.ArtifactType.Workflow, status=model.WorkflowStatus.active(), user=user, details=details)
return self._jobs_query(
model.ArtifactType.Workflow, status=model.WorkflowStatus.active(), user=user, details=details)

def jobs_all_running_workflows(self, user=None, details=True):
return self._jobs_query(model.ArtifactType.Workflow, status=model.WorkflowStatus.running(), user=user, details=details)
return self._jobs_query(
model.ArtifactType.Workflow, status=model.WorkflowStatus.running(), user=user, details=details)

def jobs_running_workflows(self, name, user=None, details=True):
return self._jobs_query(
Expand All @@ -281,10 +283,12 @@ def jobs_all_coordinators(self, name=None, user=None, limit=0, details=True):
return self._jobs_query(model.ArtifactType.Coordinator, name=name, user=user, limit=limit, details=details)

def jobs_all_active_coordinators(self, user=None, details=True):
return self._jobs_query(model.ArtifactType.Coordinator, status=model.CoordinatorStatus.active(), user=user, details=details)
return self._jobs_query(
model.ArtifactType.Coordinator, status=model.CoordinatorStatus.active(), user=user, details=details)

def jobs_all_running_coordinators(self, user=None, details=True):
return self._jobs_query(model.ArtifactType.Coordinator, status=model.CoordinatorStatus.running(), user=user, details=details)
return self._jobs_query(
model.ArtifactType.Coordinator, status=model.CoordinatorStatus.running(), user=user, details=details)

def jobs_all_suspended_coordinators(self, user=None):
return self._jobs_query(model.ArtifactType.Coordinator, status=model.CoordinatorStatus.suspended(), user=user)
Expand Down
30 changes: 17 additions & 13 deletions tests/pyoozie/test_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,21 +463,21 @@ def test_jobs_all_active_workflows(self, api, sample_workflow_running):
mock_query.return_value = [sample_workflow_running]

api.jobs_all_active_workflows()
mock_query.assert_called_with(model.ArtifactType.Workflow, user=None, status=expected_statuses)
mock_query.assert_called_with(model.ArtifactType.Workflow, details=True, user=None, status=expected_statuses)

api.jobs_all_active_workflows(user='john_doe')
mock_query.assert_called_with(model.ArtifactType.Workflow, user='john_doe', status=expected_statuses)
mock_query.assert_called_with(model.ArtifactType.Workflow, details=True, user='john_doe', status=expected_statuses)

def test_jobs_all_running_workflows(self, api, sample_workflow_running):
expected_statuses = model.WorkflowStatus.running()
with mock.patch.object(api, '_jobs_query') as mock_query:
mock_query.return_value = [sample_workflow_running]

api.jobs_all_running_workflows()
mock_query.assert_called_with(model.ArtifactType.Workflow, user=None, status=expected_statuses)
mock_query.assert_called_with(model.ArtifactType.Workflow, details=True, user=None, status=expected_statuses)

api.jobs_all_running_workflows(user='john_doe')
mock_query.assert_called_with(model.ArtifactType.Workflow, user='john_doe', status=expected_statuses)
mock_query.assert_called_with(model.ArtifactType.Workflow, details=True, user='john_doe', status=expected_statuses)

def test_jobs_running_workflows(self, api, sample_workflow_running):
expected_statuses = model.WorkflowStatus.running()
Expand All @@ -487,13 +487,15 @@ def test_jobs_running_workflows(self, api, sample_workflow_running):
api.jobs_running_workflows('my_workflow')
mock_query.assert_called_with(
model.ArtifactType.Workflow,
details=True,
name='my_workflow',
user=None,
status=expected_statuses)

api.jobs_running_workflows('my_workflow', user='john_doe')
mock_query.assert_called_with(
model.ArtifactType.Workflow,
details=True,
name='my_workflow',
user='john_doe',
status=expected_statuses)
Expand All @@ -513,34 +515,36 @@ def test_jobs_workflow_names_parameters(self, api):
mock_query.return_value = []

api.jobs_workflow_names()
mock_query.assert_called_with(model.ArtifactType.Workflow, user=None, details=False)
mock_query.assert_called_with(model.ArtifactType.Workflow, user=None, details=False, limit=0)

api.jobs_workflow_names(user='john_doe')
mock_query.assert_called_with(model.ArtifactType.Workflow, user='john_doe', details=False)
mock_query.assert_called_with(model.ArtifactType.Workflow, user='john_doe', details=False, limit=0)

def test_jobs_all_coordinators(self, api, sample_coordinator_running):
with mock.patch.object(api, '_jobs_query') as mock_query:
mock_query.return_value = [sample_coordinator_running]

api.jobs_all_coordinators()
mock_query.assert_called_with(model.ArtifactType.Coordinator, name=None, user=None, limit=0)
mock_query.assert_called_with(model.ArtifactType.Coordinator, details=True, name=None, user=None, limit=0)

api.jobs_all_coordinators(name='my_coordinator')
mock_query.assert_called_with(model.ArtifactType.Coordinator, name='my_coordinator', user=None, limit=0)
mock_query.assert_called_with(model.ArtifactType.Coordinator, details=True, name='my_coordinator', user=None, limit=0)

api.jobs_all_coordinators(user='john_doe')
mock_query.assert_called_with(model.ArtifactType.Coordinator, name=None, user='john_doe', limit=0)
mock_query.assert_called_with(model.ArtifactType.Coordinator, details=True, name=None, user='john_doe', limit=0)

api.jobs_all_coordinators(name='my_coordinator', user='john_doe')
mock_query.assert_called_with(
model.ArtifactType.Coordinator,
details=True,
name='my_coordinator',
user='john_doe',
limit=0)

api.jobs_all_coordinators(name='my_coordinator', limit=1)
mock_query.assert_called_with(
model.ArtifactType.Coordinator,
details=True,
name='my_coordinator',
user=None,
limit=1)
Expand All @@ -551,21 +555,21 @@ def test_jobs_all_active_coordinators(self, api, sample_coordinator_running):
mock_query.return_value = [sample_coordinator_running]

api.jobs_all_active_coordinators()
mock_query.assert_called_with(model.ArtifactType.Coordinator, user=None, status=expected_statuses)
mock_query.assert_called_with(model.ArtifactType.Coordinator, details=True, user=None, status=expected_statuses)

api.jobs_all_active_coordinators(user='john_doe')
mock_query.assert_called_with(model.ArtifactType.Coordinator, user='john_doe', status=expected_statuses)
mock_query.assert_called_with(model.ArtifactType.Coordinator, details=True, user='john_doe', status=expected_statuses)

def test_jobs_all_running_coordinators(self, api, sample_coordinator_running):
expected_statuses = model.CoordinatorStatus.running()
with mock.patch.object(api, '_jobs_query') as mock_query:
mock_query.return_value = [sample_coordinator_running]

api.jobs_all_running_coordinators()
mock_query.assert_called_with(model.ArtifactType.Coordinator, user=None, status=expected_statuses)
mock_query.assert_called_with(model.ArtifactType.Coordinator, details=True, user=None, status=expected_statuses)

api.jobs_all_running_coordinators(user='john_doe')
mock_query.assert_called_with(model.ArtifactType.Coordinator, user='john_doe', status=expected_statuses)
mock_query.assert_called_with(model.ArtifactType.Coordinator, details=True, user='john_doe', status=expected_statuses)

def test_jobs_all_suspended_coordinators(self, api, sample_coordinator_suspended):
expected_statuses = model.CoordinatorStatus.suspended()
Expand Down

0 comments on commit 4196b38

Please sign in to comment.