API: client: Drop bin directory

This patch introduces API changes for test writers

Drop the client/bin directory to make autotest
more palatable for distro packagers, also making
the API more flat. Now all uses of

autotest_lib.client.bin.[library]

become

autotest_lib.client.[library]

The conversion was mostly automated, plus some
tweaks to make autotest-local work, and moving
profilers.py code to the __init__.py of the profilers
directory.

Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>

client/bin/autotest → client/autotest

@@ -7,7 +7,7 @@ try:
 except ImportError:
     import common
 
-from autotest_lib.client.bin import autotest_local
+from autotest_lib.client import autotest_local
 
 if __name__ == '__main__':
     app = autotest_local.AutotestLocalApp()

client/bin/autotest-local → client/autotest-local

@@ -7,7 +7,7 @@ try:
 except ImportError:
     import common
 
-from autotest_lib.client.bin import autotest_local
+from autotest_lib.client import autotest_local
 
 if __name__ == '__main__':
     app = autotest_local.AutotestLocalApp()

client/bin/autotest_local.py → client/autotest_local.py

@@ -6,13 +6,13 @@
     autodirbin = os.path.join(rootdir, 'client', 'bin')
 except ImportError:
     import common
-    autodirbin = os.path.dirname(os.path.realpath(sys.argv[0]))
+    autodirbin = 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 import job
 from autotest_lib.client.common_lib import global_config
-from autotest_lib.client.bin import cmdparser, optparser
+from autotest_lib.client import cmdparser, optparser
 
 autodirtest = os.path.join(autodir, "tests")
 
@@ -61,7 +61,7 @@ def main(self):
                                                                    default=True)
 
         if self.options.client_test_setup:
-            from autotest_lib.client.bin import setup_job
+            from autotest_lib.client import setup_job
             exit_code = 0
             try:
                 setup_job.setup_tests(self.options)

client/bin/base_sysinfo.py → client/base_sysinfo.py

@@ -1,7 +1,7 @@
 import os, shutil, re, glob, subprocess, logging, gzip
 
 from autotest_lib.client.common_lib import log, global_config
-from autotest_lib.client.bin import utils, package
+from autotest_lib.client import utils, package
 
 GLOBAL_CONFIG = global_config.global_config
 

client/bin/cmdparser.py → client/cmdparser.py

@@ -5,7 +5,7 @@
 """
 
 import os, re, sys
-from autotest_lib.client.bin import os_dep
+from autotest_lib.client import os_dep
 from autotest_lib.client.common_lib import global_config
 
 GLOBAL_CONFIG = global_config.global_config

client/bin/net/common.py → client/common.py

@@ -3,8 +3,7 @@
     import autotest.client.setup_modules as setup_modules
     client_dir = os.path.dirname(setup_modules.__file__)
 except ImportError:
-    dirname = os.path.dirname(sys.modules[__name__].__file__)
-    client_dir = os.path.abspath(os.path.join(dirname, "../.."))
+    client_dir = os.path.dirname(sys.modules[__name__].__file__)
     sys.path.insert(0, client_dir)
     import setup_modules
     sys.path.pop(0)

client/common_lib/base_job.py

@@ -1023,7 +1023,7 @@ def readwrite_dir(*args):
             return self._job_directory(os.path.join(*args), True)
 
         # various client-specific directories
-        self._bindir = readonly_dir(self.clientdir, 'bin')
+        self._bindir = readonly_dir(self.clientdir)
         self._configdir = readonly_dir(self.clientdir, 'config')
         self._profdir = readonly_dir(self.clientdir, 'profilers')
         self._pkgdir = readwrite_dir(self.clientdir, 'packages')

client/common_lib/base_packages.py

@@ -6,7 +6,7 @@
 """
 
 import fcntl, logging, os, re, shutil
-from autotest_lib.client.bin import os_dep
+from autotest_lib.client import os_dep
 from autotest_lib.client.common_lib import error, utils, global_config
 
 

client/common_lib/base_syncdata.py

@@ -3,7 +3,7 @@
 from autotest_lib.client.common_lib import barrier
 from autotest_lib.client.common_lib import utils
 from autotest_lib.client.common_lib import autotemp
-from autotest_lib.client.bin import parallel
+from autotest_lib.client import parallel
 
 _DEFAULT_PORT = 13234
 _DEFAULT_TIMEOUT = 10

client/common_lib/git.py

@@ -5,7 +5,7 @@
 
 import os, logging
 import error
-from autotest_lib.client.bin import utils, os_dep
+from autotest_lib.client import utils, os_dep
 
 
 __all__ = ["GitRepoHelper", "get_repo"]

client/common_lib/hosts/base_classes.py

@@ -19,7 +19,7 @@
 
 from autotest_lib.client.common_lib import global_config, error, utils
 from autotest_lib.client.common_lib import host_protections
-from autotest_lib.client.bin import partition
+from autotest_lib.client import partition
 
 
 class Host(object):

client/common_lib/software_manager.py

@@ -24,7 +24,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.client.bin import os_dep, utils
+from autotest_lib.client import os_dep, utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.common_lib import logging_config, logging_manager
 

client/common_lib/test.py

@@ -19,7 +19,7 @@
 import fcntl, getpass, os, re, sys, shutil, tempfile, time, traceback, logging
 
 from autotest_lib.client.common_lib import error, global_config
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 
 GLOBAL_CONFIG = global_config.global_config

client/bin/cpuset.py → client/cpuset.py

@@ -5,7 +5,7 @@
 #   for use on kernels not running some site-specific container manager
 
 import os, sys, re, glob, fcntl, logging
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 from autotest_lib.client.common_lib import error
 
 SUPER_ROOT = ''      # root of all containers or cgroups

client/deps/boottool/boottool.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 # To use this, you have to set PERL5LIB to:
 #               autodir+'deps/boottool/lib/perl'

client/deps/dejagnu/dejagnu.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 1
 

client/deps/grubby/grubby.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 1
 

client/deps/libaio/libaio.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 1
 

client/deps/libcap/libcap.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 2
 

client/deps/libnet/libnet.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 1
 

client/deps/mysql/mysql.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 3
 

client/deps/pgpool/pgpool.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 1
 

client/deps/pgsql/pgsql.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import os
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 4
 

client/deps/systemtap/systemtap.py

@@ -2,7 +2,7 @@
 
 import os
 import shutil
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 version = 1
 

client/bin/fsdev_disks.py → client/fsdev_disks.py

@@ -1,5 +1,5 @@
 import sys, os, re, string
-from autotest_lib.client.bin import utils, fsinfo, fsdev_mgr, partition
+from autotest_lib.client import utils, fsinfo, fsdev_mgr, partition
 from autotest_lib.client.common_lib import error
 
 

client/bin/fsdev_disks_unittest.py → client/fsdev_disks_unittest.py

@@ -9,7 +9,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.client.bin import fsdev_disks
+from autotest_lib.client import fsdev_disks
 
 class fsdev_disks_test(unittest.TestCase):
     def test_legacy_str_to_test_flags(self):

client/bin/fsdev_mgr.py → client/fsdev_mgr.py

@@ -4,7 +4,7 @@
 to any of these methods should inherit this class.
 """
 
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 
 class BaseFsdevManager(object):
 
@@ -43,7 +43,7 @@ def use_partition(self, part_name):
 
 
 SiteFsdevManager = utils.import_site_class(
-    __file__, "autotest_lib.client.bin.site_fsdev", "SiteFsdevManager",
+    __file__, "autotest_lib.client.site_fsdev", "SiteFsdevManager",
     BaseFsdevManager)
 
 # Wrap whatever SiteFsdevManager class we've found above in a class

client/bin/fsinfo_unittest.py → client/fsinfo_unittest.py

@@ -5,7 +5,7 @@
     import autotest.common as common
 except ImportError:
     import common
-from autotest_lib.client.bin import fsinfo
+from autotest_lib.client import fsinfo
 from autotest_lib.client.common_lib.test_utils import mock
 
 class fsionfo_test(unittest.TestCase):

client/bin/harness.py → client/harness.py

@@ -94,7 +94,7 @@ def select(which, job, harness_args):
 
     harness_name = 'harness_%s' % which
     harness_module = common.setup_modules.import_module(harness_name,
-                                                        'autotest_lib.client.bin')
+                                                        'autotest_lib.client')
     harness_instance = getattr(harness_module, harness_name)(job, harness_args)
 
     return harness_instance

client/bin/harness_ABAT.py → client/harness_ABAT.py

@@ -5,7 +5,7 @@
 
 __author__ = """Copyright Andy Whitcroft 2006"""
 
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 import os, harness, time, re
 
 def autobench_load(fn):

client/bin/harness_autoserv.py → client/harness_autoserv.py

@@ -1,7 +1,7 @@
 import os, logging, ConfigParser
 from autotest_lib.client.common_lib import autotemp, base_packages, error
 from autotest_lib.client.common_lib import global_config
-from autotest_lib.client.bin import harness
+from autotest_lib.client import harness
 
 
 class harness_autoserv(harness.harness):

client/bin/harness_standalone.py → client/harness_standalone.py

@@ -6,7 +6,7 @@
 __author__ = """Copyright Andy Whitcroft 2007"""
 
 from autotest_lib.client.common_lib import error
-from autotest_lib.client.bin import utils
+from autotest_lib.client import utils
 import os, harness, shutil, logging
 
 class harness_standalone(harness.harness):

client/bin/harness_unittest.py → client/harness_unittest.py

@@ -5,7 +5,7 @@
 except ImportError:
     import common
 from autotest_lib.client.common_lib.test_utils import mock
-from autotest_lib.client.bin import harness, harness_standalone, harness_ABAT
+from autotest_lib.client import harness, harness_standalone, harness_ABAT
 
 
 class harness_unittest(unittest.TestCase):