Cleanups to code controlling where Autotest clients get installed and used by Autoserv.
* change autotest._get_autodir() back to looking for the autotest client executable, document explicitly that it's looking for an existing autotest installation, give it a unique exception to raise upon failure, and make it a public classmethod of the Autotest class. also renamed it to get_installed_autodir() to be even more explicit about what it's doing.
* change _get_install_dir() to look through client_autodir_paths for the first one it can create (if no existing installation exists), rather than just hardcoding the default to /usr/local/autotest. also make it a public classmethod.
* make verify_software_only() use get_install_dir() rather than get_installed_autodir(), since i think that makes more sense for what it's doing.
Signed-off-by: Steve Howard <showard@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3872 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/self-test/autotest_test.py b/server/self-test/autotest_test.py
index 08dc482..cf4e9a9 100755
--- a/server/self-test/autotest_test.py
+++ b/server/self-test/autotest_test.py
@@ -45,13 +45,13 @@
host = MockInstallHost()
self.assertEqual('/stuff/autotest',
- autotest._get_autodir(host))
+ autotest.Autotest.get_installed_autodir(host))
host.result = "autodir=/stuff/autotest\n"
self.assertEqual('/stuff/autotest',
- autotest._get_autodir(host))
+ autotest.Autotest.get_installed_autodir(host))
host.result = 'autodir="/stuff/auto test"\n'
self.assertEqual('/stuff/auto test',
- autotest._get_autodir(host))
+ autotest.Autotest.get_installed_autodir(host))
def testInstallFromDir(self):