Makes some changes to the partitioning code and the autotest.py code to make it a little easier to override more reliably. Specifically:
- Switch the partition imports from execfile back to an import * style of loading, ultimately import seems to be the most reliable and portable
- Clean up the base+site definitions in autotest.py to make Site overrides more consistent
- Drop the explicit failure if the Autotest.source_material is a file and not a directory, there's no reason to outright fail and it just introduces some unnecessary fragility
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@4736 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/partition.py b/client/bin/partition.py
index 89fb5c4..98c1307 100644
--- a/client/bin/partition.py
+++ b/client/bin/partition.py
@@ -2,10 +2,9 @@
This is a high level partition module that executes the contents of
base_partition.py and if it exists the contents of site_partition.py.
"""
-import os
-execfile(os.path.join(os.path.dirname(__file__), 'base_partition.py'))
-
-__site_path = os.path.join(os.path.dirname(__file__), 'site_partition.py')
-if os.path.exists(__site_path):
- execfile(__site_path)
+from autotest_lib.client.bin.base_partition import *
+try:
+ from autotest_lib.client.bin.site_partition import *
+except ImportError:
+ pass