Make more names pep8 compliant across the tree

Fix policy and utility function, method and variable names to use
lower case underscored style instead of camelCase.

Related to Issue #112.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

4 files changed, 14 insertions, 14 deletions

diff --git a/tests/option_tests.py b/tests/option_tests.py
index 6114c9b2..d221b965 100644
--- a/tests/option_tests.py
+++ b/tests/option_tests.py
@@ -15,8 +15,8 @@ class GlobalOptionTest(unittest.TestCase):
             },
         }
         self.plugin = Plugin(self.commons)
-        self.plugin.optNames = ['baz', 'empty']
-        self.plugin.optParms = [{'enabled': False}, {'enabled': None}]
+        self.plugin.opt_names = ['baz', 'empty']
+        self.plugin.opt_parms = [{'enabled': False}, {'enabled': None}]
 
     def test_simple_lookup(self):
         self.assertEquals(self.plugin.get_option('test_option'), 'foobar')
diff --git a/tests/plugin_tests.py b/tests/plugin_tests.py
index 153ff350..09d4c2ac 100644
--- a/tests/plugin_tests.py
+++ b/tests/plugin_tests.py
@@ -50,7 +50,7 @@ class MockArchive(Archive):
 
 class MockPlugin(Plugin):
 
-    optionList = [("opt", 'an option', 'fast', None),
+    option_list = [("opt", 'an option', 'fast', None),
                   ("opt2", 'another option', 'fast', False)]
 
     def setup(self):
@@ -237,12 +237,12 @@ class AddCopySpecLimitTests(unittest.TestCase):
 
     def test_single_file_under_limit(self):
         self.mp.add_copy_spec_limit("tests/tail_test.txt", 1)
-        self.assertEquals(self.mp.copyPaths, [('tests/tail_test.txt', None)])
+        self.assertEquals(self.mp.copy_paths, [('tests/tail_test.txt', None)])
 
     def test_single_file_over_limit(self):
         fn = create_file(2) # create 2MB file, consider a context manager
         self.mp.add_copy_spec_limit(fn, 1, sub=('tmp', 'awesome'))
-        content, fname = self.mp.copyStrings[0]
+        content, fname = self.mp.copy_strings[0]
         self.assertTrue("tailed" in fname)
         self.assertTrue("awesome" in fname)
         self.assertTrue("/" not in fname)
@@ -258,8 +258,8 @@ class AddCopySpecLimitTests(unittest.TestCase):
         fn = create_file(2)
         fn2 = create_file(2)
         self.mp.add_copy_spec_limit("/tmp/tmp*", 1)
-        self.assertEquals(len(self.mp.copyStrings), 1)
-        content, fname = self.mp.copyStrings[0]
+        self.assertEquals(len(self.mp.copy_strings), 1)
+        content, fname = self.mp.copy_strings[0]
         self.assertTrue("tailed" in fname)
         self.assertEquals(1024 * 1024, len(content))
         os.unlink(fn)
diff --git a/tests/policy_tests.py b/tests/policy_tests.py
index 25795a1c..aa74da7d 100644
--- a/tests/policy_tests.py
+++ b/tests/policy_tests.py
@@ -54,16 +54,16 @@ class PackageManagerTests(unittest.TestCase):
         self.pm = PackageManager()
 
     def test_default_all_pkgs(self):
-        self.assertEquals(self.pm.allPkgs(), {})
+        self.assertEquals(self.pm.all_pkgs(), {})
 
     def test_default_all_pkgs_by_name(self):
-        self.assertEquals(self.pm.allPkgsByName('doesntmatter'), [])
+        self.assertEquals(self.pm.all_pkgs_by_name('doesntmatter'), [])
 
     def test_default_all_pkgs_by_name_regex(self):
-        self.assertEquals(self.pm.allPkgsByNameRegex('.*doesntmatter$'), [])
+        self.assertEquals(self.pm.all_pkgs_by_name_regex('.*doesntmatter$'), [])
 
     def test_default_pkg_by_name(self):
-        self.assertEquals(self.pm.pkgByName('foo'), None)
+        self.assertEquals(self.pm.pkg_by_name('foo'), None)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/utilities_tests.py b/tests/utilities_tests.py
index 7b5a6a3b..5520bb16 100644
--- a/tests/utilities_tests.py
+++ b/tests/utilities_tests.py
@@ -2,7 +2,7 @@ import os.path
 import unittest
 from StringIO import StringIO
 
-from sos.utilities import grep, DirTree, checksum, get_hash_name, is_executable, sosGetCommandOutput, find, tail, shell_out
+from sos.utilities import grep, DirTree, checksum, get_hash_name, is_executable, sos_get_command_output, find, tail, shell_out
 import sos
 
 TEST_DIR = os.path.dirname(__file__)
@@ -76,13 +76,13 @@ class ExecutableTest(unittest.TestCase):
 
     def test_output(self):
         path = os.path.join(TEST_DIR, 'test_exe.py')
-        ret, out, junk = sosGetCommandOutput(path)
+        ret, out, junk = sos_get_command_output(path)
         self.assertEquals(ret, 0)
         self.assertEquals(out, "executed\n")
 
     def test_output_non_exe(self):
         path = os.path.join(TEST_DIR, 'utility_tests.py')
-        ret, out, junk = sosGetCommandOutput(path)
+        ret, out, junk = sos_get_command_output(path)
         self.assertEquals(ret, 127)
         self.assertEquals(out, "")