Bug 1178240 - Clean up buildapi imports

tests/etl/test_buildapi.py

@@ -9,6 +9,10 @@ import json
 
 from django.conf import settings
 
+from treeherder.etl.buildapi import (PendingJobsProcess,
+                                     RunningJobsProcess,
+                                     Builds4hJobsProcess)
+
 
 @pytest.fixture
 def mock_buildapi_pending_url(monkeypatch):
@@ -110,7 +114,6 @@ def test_ingest_pending_jobs(jm, initial_data,
     """
     a new buildapi pending job creates a new obj in the job table
     """
-    from treeherder.etl.buildapi import PendingJobsProcess
     etl_process = PendingJobsProcess()
     etl_process.run()
 
@@ -131,7 +134,6 @@ def test_ingest_running_jobs(jm, initial_data,
     """
     a new buildapi running job creates a new obj in the job table
     """
-    from treeherder.etl.buildapi import RunningJobsProcess
     etl_process = RunningJobsProcess()
     etl_process.run()
 
@@ -152,7 +154,6 @@ def test_ingest_builds4h_jobs(jm, initial_data,
     """
     a new buildapi completed job creates a new obj in the job table
     """
-    from treeherder.etl.buildapi import Builds4hJobsProcess
     etl_process = Builds4hJobsProcess()
     etl_process.run()
 
@@ -175,9 +176,6 @@ def test_ingest_running_to_complete_job(jm, initial_data,
     a new buildapi running job transitions to a new completed job
 
     """
-    from treeherder.etl.buildapi import RunningJobsProcess
-    from treeherder.etl.buildapi import Builds4hJobsProcess
-
     etl_process = RunningJobsProcess()
     etl_process.run()
 
@@ -213,7 +211,6 @@ def test_ingest_running_job_fields(jm, initial_data,
     """
     a new buildapi running job creates a new obj in the job table
     """
-    from treeherder.etl.buildapi import RunningJobsProcess
     etl_process = RunningJobsProcess()
     etl_process.run()
 
@@ -237,7 +234,6 @@ def test_ingest_pending_jobs_1_missing_resultset(jm, initial_data,
     """
     Ensure the pending job with the missing resultset is queued for refetching
     """
-    from treeherder.etl.buildapi import PendingJobsProcess
     etl_process = PendingJobsProcess()
     _do_missing_resultset_test(jm, etl_process)
 
@@ -249,7 +245,6 @@ def test_ingest_running_jobs_1_missing_resultset(jm, initial_data,
     """
     Ensure the running job with the missing resultset is queued for refetching
     """
-    from treeherder.etl.buildapi import RunningJobsProcess
     etl_process = RunningJobsProcess()
     _do_missing_resultset_test(jm, etl_process)
 
@@ -261,7 +256,6 @@ def test_ingest_builds4h_jobs_1_missing_resultset(jm, initial_data,
     """
     Ensure the builds4h job with the missing resultset is queued for refetching
     """
-    from treeherder.etl.buildapi import Builds4hJobsProcess
     etl_process = Builds4hJobsProcess()
     _do_missing_resultset_test(jm, etl_process)
 
@@ -273,7 +267,6 @@ def test_ingest_builds4h_jobs_missing_branch(jm, initial_data,
     """
     Ensure the builds4h job with the missing resultset is queued for refetching
     """
-    from treeherder.etl.buildapi import Builds4hJobsProcess
     etl_process = Builds4hJobsProcess()
 
     etl_process.run()

treeherder/etl/buildapi.py

@@ -3,12 +3,12 @@
 # file, you can obtain one at http://mozilla.org/MPL/2.0/.
 
 import logging
-import simplejson as json
-
 from collections import defaultdict
-from django.conf import settings
-from treeherder.client import TreeherderJobCollection
 
+import simplejson as json
+from django.conf import settings
+
+from treeherder.client import TreeherderJobCollection
 from treeherder.etl import common, buildbot
 from treeherder.etl.mixins import JsonExtractorMixin, OAuthLoaderMixin
 from treeherder.model.models import Datasource