Added a function to import site specific functions. Modified code to use it.
Signed-off-by: Mihai Rusu <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2628 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/server_job.py b/server/server_job.py
index 57c9810..256562a 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -34,15 +34,15 @@
REPAIR_CONTROL_FILE = _control_segment_path('repair')
+# by default provide a stub that generates no site data
+def _get_site_job_data_dummy(job):
+ return {}
+
+
# load up site-specific code for generating site-specific job data
-try:
- import site_job
- get_site_job_data = site_job.get_site_job_data
- del site_job
-except ImportError:
- # by default provide a stub that generates no site data
- def get_site_job_data(job):
- return {}
+get_site_job_data = utils.import_site_function(__file__,
+ "autotest_lib.server.site_job", "get_site_job_data",
+ _get_site_job_data_dummy)
class base_server_job(object):
