Some small change to global_config.py and migrate.py as well as
migrate_unittest.py
From: travis miller
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1504 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/common_lib/global_config_unittest.py b/client/common_lib/global_config_unittest.py
index 7ddc104..a240091 100644
--- a/client/common_lib/global_config_unittest.py
+++ b/client/common_lib/global_config_unittest.py
@@ -58,7 +58,9 @@
def tearDown(self):
os.remove(self.global_file)
os.remove(self.shadow_file)
-
+ self.conf.set_config_files(global_config.DEFAULT_CONFIG_FILE,
+ global_config.DEFAULT_SHADOW_FILE)
+
def testFloat(self):
val = self.conf.get_config_value("SECTION_A", "value_1", float)
diff --git a/migrate/migrate.py b/migrate/migrate.py
index d89f808..5382252 100755
--- a/migrate/migrate.py
+++ b/migrate/migrate.py
@@ -3,7 +3,8 @@
import os, sys, re, subprocess, tempfile
import MySQLdb, MySQLdb.constants.ER
from optparse import OptionParser
-from common import global_config
+import common
+from autotest_lib.client.common_lib import global_config
MIGRATE_TABLE = 'migrate_info'
DEFAULT_MIGRATIONS_DIR = 'migrations'
@@ -47,6 +48,7 @@
def read_db_info(self):
# grab the config file and parse for info
c = global_config.global_config
+ sections = c.get_sections()
self.db_host = c.get_config_value(self.database, "host")
self.db_name = c.get_config_value(self.database, "database")
self.username = c.get_config_value(self.database, "user")
diff --git a/migrate/migrate_unittest.py b/migrate/migrate_unittest.py
index d644754..ec4ece1 100644
--- a/migrate/migrate_unittest.py
+++ b/migrate/migrate_unittest.py
@@ -3,7 +3,8 @@
import unittest
import MySQLdb
import migrate
-from common import global_config
+import common
+from autotest_lib.client.common_lib import global_config
# Which section of the global config to pull info from. We won't actually use
# that DB, we'll use the corresponding test DB (test_<db name>).