Convert entry points to use system-wide autotest libs v3

If it fails, fallback to the approach used for single directory layout (just import common). Changes from v2: * Fixed patch to take into account the namespace cleanup patches Changes from v1: * dzickus found a typo in client/setup_modules.py and fixed it * mkrizek found that in some points we should import autotest.common as common, and for safety, converted all import calls to look like that. Signed-off-by: Don Zickus <[email protected]> Signed-off-by: James Laska <[email protected]> Signed-off-by: Lucas Meneghel Rodrigues <[email protected]> Signed-off-by: Martin Krizek <[email protected]>
yumingfei · Feb 7, 2012 · b67dfa6 · b67dfa6
1 parent c9c767c
commit b67dfa6
Show file tree

Hide file tree

Showing 189 changed files with 776 additions and 200 deletions.
diff --git a/CODING_STYLE b/CODING_STYLE
@@ -84,7 +84,10 @@ from common_lib.error import AutoservError
 For example:
 import os, pickle, random, re, select, shutil, signal, StringIO, subprocess
 import sys, time, urllib, urlparse
-import common   # Magic autotest_lib module and sys.path setup code.
+try:
+    import autotest.common   
+except ImportError:
+    import common   # Magic autotest_lib module and sys.path setup code.
 import MySQLdb  # After common so that we check our site-packages first.
 from common_lib import error
 

diff --git a/cli/acl_unittest.py b/cli/acl_unittest.py
@@ -6,7 +6,10 @@
 
 import unittest, sys
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import topic_common, action_common, acl, cli_mock
 
 

diff --git a/cli/action_common_unittest.py b/cli/action_common_unittest.py
@@ -6,7 +6,10 @@
 
 import unittest, os, sys, StringIO, copy
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, topic_common, action_common, rpc
 from autotest_lib.frontend.afe.json_rpc import proxy
 

diff --git a/cli/atest b/cli/atest
@@ -1,7 +1,10 @@
 #!/usr/bin/python -u
 
 import sys
-import common
+try:
+    import autotest.common
+except ImportError:
+    import common
 from autotest_lib.cli import atest
 
 

diff --git a/cli/atest.py b/cli/atest.py
@@ -18,7 +18,10 @@
 
 import os, sys, optparse, re, traceback
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import topic_common
 
 

diff --git a/cli/atest_migrate_host b/cli/atest_migrate_host
@@ -1,7 +1,10 @@
 #!/usr/bin/python
 # Copyright Google, Martin J. Bligh <[email protected]>, Jan 2009
 import os, sys
-import common
+try:
+    import autotest.common
+except ImportError:
+    import common
 from autotest_lib.server import frontend
 
 try:

diff --git a/cli/atest_unittest.py b/cli/atest_unittest.py
@@ -6,7 +6,10 @@
 
 import unittest, os, sys, StringIO
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock
 
 

diff --git a/cli/atomicgroup_unittest.py b/cli/atomicgroup_unittest.py
@@ -4,7 +4,10 @@
 
 import unittest
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, topic_common, atomicgroup
 
 

diff --git a/cli/autotest-rpc-client b/cli/autotest-rpc-client
@@ -1,7 +1,10 @@
 #!/usr/bin/python -u
 
 import sys
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import atest
 
 

diff --git a/cli/change_protection_level.py b/cli/change_protection_level.py
@@ -3,7 +3,10 @@
 # change_protection_level.py "No protection" machine1 machine2 machine3
 
 import sys, optparse, traceback, pwd, os
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import rpc, host
 
 usage = 'usage: %prog [options] new_protection_level machine1 machine2 ...'

diff --git a/cli/cli_mock.py b/cli/cli_mock.py
@@ -5,7 +5,10 @@
 
 import unittest, os, sys, StringIO
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import atest, topic_common, rpc
 from autotest_lib.frontend.afe import rpc_client_lib
 from autotest_lib.frontend.afe.json_rpc import proxy

diff --git a/cli/compose_query b/cli/compose_query
@@ -4,7 +4,10 @@ Selects all rows and columns that satisfy the condition specified
 and prints the matrix.
 """
 import sys, os, re, optparse
-import common
+try:
+    import autotest.common
+except ImportError:
+    import common
 from autotest_lib.client.common_lib import kernel_versions
 from autotest_lib.tko import display, frontend, db, query_lib
 

diff --git a/cli/contrib/why_isnt_my_job_running.py b/cli/contrib/why_isnt_my_job_running.py
@@ -1,7 +1,10 @@
 #!/usr/bin/python
 
 import sys, optparse, pwd
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import rpc, host
 from autotest_lib.client.common_lib import host_queue_entry_states
 

diff --git a/cli/host_unittest.py b/cli/host_unittest.py
@@ -6,7 +6,10 @@
 
 import unittest, os, sys
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, host
 
 

diff --git a/cli/job_unittest.py b/cli/job_unittest.py
@@ -7,7 +7,10 @@
 
 import copy, getpass, unittest, sys, os
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, topic_common, job
 from autotest_lib.client.common_lib.test_utils import mock
 

diff --git a/cli/label_unittest.py b/cli/label_unittest.py
@@ -6,7 +6,10 @@
 
 import unittest, sys, os
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, topic_common
 
 

diff --git a/cli/query_keyvals b/cli/query_keyvals
@@ -1,7 +1,10 @@
 #!/usr/bin/python
 
 import sys, optparse
-import common
+try:
+    import autotest.common
+except ImportError:
+    import common
 from autotest_lib.cli import rpc
 
 

diff --git a/cli/query_results b/cli/query_results
@@ -4,7 +4,10 @@ Selects all rows and columns that satisfy the condition specified
 and prints the matrix.
 """
 import optparse
-import common
+try:
+    import autotest.common
+except ImportError:
+    import common
 from autotest_lib.cli import rpc
 from autotest_lib.database import database_connection
 

diff --git a/cli/rpc_unittest.py b/cli/rpc_unittest.py
@@ -5,7 +5,10 @@
 """Test for the rpc proxy class."""
 
 import unittest, os
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import rpc
 from autotest_lib.client.common_lib import global_config
 from autotest_lib.frontend.afe import rpc_client_lib

diff --git a/cli/test_unittest.py b/cli/test_unittest.py
@@ -6,7 +6,10 @@
 
 import unittest, sys, os
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, topic_common, test
 
 

diff --git a/cli/threads_unittest.py b/cli/threads_unittest.py
@@ -8,7 +8,10 @@
 
 import threading, Queue
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, threads
 
 

diff --git a/cli/topic_common_unittest.py b/cli/topic_common_unittest.py
@@ -6,7 +6,10 @@
 
 import unittest, os, sys, StringIO, urllib2
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, topic_common, rpc
 from autotest_lib.frontend.afe.json_rpc import proxy
 

diff --git a/cli/user_unittest.py b/cli/user_unittest.py
@@ -6,7 +6,10 @@
 
 import unittest, os, sys
 
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.cli import cli_mock, user
 
 

diff --git a/client/bin/autotest b/client/bin/autotest
@@ -2,7 +2,12 @@
 #
 # autotest <control file> - run the autotest control file specified.
 #
-import autotest_local
+try:
+    import autotest.common as common
+except ImportError:
+    import common
+
+from autotest_lib.client.bin import autotest_local
 
 if __name__ == '__main__':
     autotest_local.main()
diff --git a/client/bin/autotest-local b/client/bin/autotest-local
@@ -2,7 +2,12 @@
 #
 # autotest <control file> - run the autotest control file specified.
 #
-import autotest_local
+try:
+    import autotest.common as common
+except ImportError:
+    import common
+
+from autotest_lib.client.bin import autotest_local
 
 if __name__ == '__main__':
     autotest_local.main()
diff --git a/client/bin/autotest_client b/client/bin/autotest_client
@@ -1,5 +1,8 @@
 #!/usr/bin/python
-import common
+try:
+    import autotest.common
+except ImportError:
+    import common
 
 import sys, os, time, subprocess
 

diff --git a/client/bin/autotest_local.py b/client/bin/autotest_local.py
@@ -1,27 +1,30 @@
 import os, sys
-import common
 from optparse import OptionParser
+try:
+    import autotest.common as common
+    rootdir = os.path.abspath(os.path.dirname(common.__file__))
+    autodir = os.path.join(rootdir, 'client')
+    autodirbin = os.path.join(rootdir, 'client', 'bin')
+except ImportError:
+    import common
+    autodirbin = os.path.dirname(os.path.realpath(sys.argv[0]))
+    autodir = os.path.dirname(autodirbin)
+    sys.path.insert(0, autodirbin)
+
 from autotest_lib.client.bin import job
 from autotest_lib.client.common_lib import global_config
 from autotest_lib.client.bin import cmdparser
 
-# Use the name of the binary to find the real installation directory
-# aka $AUTODIR.  Update our path to include the $AUTODIR/bin/tests
-# directory and ensure we have $AUTODIR in our environment.
-autodirbin = os.path.dirname(os.path.realpath(sys.argv[0]))
-autodir = os.path.dirname(autodirbin)
 autodirtest = os.path.join(autodir, "tests")
 
-sys.path.insert(0, autodirbin)
-
 os.environ['AUTODIR'] = autodir
 os.environ['AUTODIRBIN'] = autodirbin
 os.environ['AUTODIRTEST'] = autodirtest
 os.environ['PYTHONPATH'] = autodirbin
 
 cmd_parser = cmdparser.CommandParser() # Allow access to instance in parser
 
-commandinfo = "[command] (optional)\tOne of: "+str(cmd_parser.cmdlist)
+commandinfo = "[command] (optional)\tOne of: " + str(cmd_parser.cmdlist)
 if sys.version_info[0:2] < (2,6):
     parser = OptionParser(usage='Usage: %prog [options] [command] <control-file>',
                           description=commandinfo)

diff --git a/client/bin/autotestd b/client/bin/autotestd
@@ -1,6 +1,9 @@
 #!/usr/bin/python
 
-import common
+try:
+    import autotest.common
+except ImportError:
+    import common
 import sys, os, subprocess, fcntl
 
 

diff --git a/client/bin/autotestd_monitor b/client/bin/autotestd_monitor
@@ -1,6 +1,9 @@
 #!/usr/bin/python
 
-import common
+try:
+    import autotest.common
+except ImportError:
+    import common
 import sys, os, signal, time, subprocess, fcntl
 
 logdir = sys.argv[1]

diff --git a/client/bin/client_logging_config.py b/client/bin/client_logging_config.py
@@ -1,4 +1,7 @@
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 import logging, os
 from autotest_lib.client.common_lib import logging_config, global_config
 

diff --git a/client/bin/fsdev_disks_unittest.py b/client/bin/fsdev_disks_unittest.py
@@ -5,7 +5,10 @@
 __author__ = '[email protected] (Gregory Smith)'
 
 import unittest
-import common
+try:
+    import autotest.common as common
+except ImportError:
+    import common
 from autotest_lib.client.bin import fsdev_disks
 
 class fsdev_disks_test(unittest.TestCase):