BIND 10 trac2297, updated. ab6215d2e93f0bc0206f4503a9e5b0ea62bf65f3 [2297] Update .gitignore

[BIND 10 source code commits]

The branch, trac2297 has been updated
       via  ab6215d2e93f0bc0206f4503a9e5b0ea62bf65f3 (commit)
       via  fd2e13361be9f4e4fb4e1098bae2058de33432f7 (commit)
       via  f6af1e6965348482deb45174ba7b4dcb6e9cef61 (commit)
      from  29047b54a17c2bc1d27096ea21522e928b51989f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ab6215d2e93f0bc0206f4503a9e5b0ea62bf65f3
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Oct 26 06:51:21 2012 +0530

    [2297] Update .gitignore

commit fd2e13361be9f4e4fb4e1098bae2058de33432f7
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Oct 26 06:50:21 2012 +0530

    [2297] Return output value directly

commit f6af1e6965348482deb45174ba7b4dcb6e9cef61
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Oct 26 06:49:58 2012 +0530

    [2297] Make some minor readability and typo fixes in comments

-----------------------------------------------------------------------

Summary of changes:
 src/bin/sysinfo/.gitignore                       |    3 ++-
 src/lib/python/isc/sysinfo/sysinfo.py            |    2 +-
 src/lib/python/isc/sysinfo/tests/sysinfo_test.py |   14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/sysinfo/.gitignore b/src/bin/sysinfo/.gitignore
index 9194aff..b5c759d 100644
--- a/src/bin/sysinfo/.gitignore
+++ b/src/bin/sysinfo/.gitignore
@@ -1,3 +1,4 @@
 /isc-sysinfo
-/sysinfo.py
 /isc-sysinfo.1
+/run_sysinfo.sh
+/sysinfo.py
diff --git a/src/lib/python/isc/sysinfo/sysinfo.py b/src/lib/python/isc/sysinfo/sysinfo.py
index e527cbe..6be7adc 100644
--- a/src/lib/python/isc/sysinfo/sysinfo.py
+++ b/src/lib/python/isc/sysinfo/sysinfo.py
@@ -413,7 +413,7 @@ class SysInfoFreeBSD(SysInfoFreeBSDOSX):
             # There doesn't seem to be an easy way to reliably detect whether
             # the kernel was built with SMP support on FreeBSD.  We use
             # a sysctl variable that is only defined in SMP kernels.
-            # This assumption seems to hold for recent several versions of
+            # This assumption seems to hold for several recent versions of
             # FreeBSD, but it may not always be so for future versions.
             s = subprocess.check_output(['sysctl', '-n',
                                          'kern.smp.forward_signal_enabled'])
diff --git a/src/lib/python/isc/sysinfo/tests/sysinfo_test.py b/src/lib/python/isc/sysinfo/tests/sysinfo_test.py
index aeeee15..9f1dd8f 100644
--- a/src/lib/python/isc/sysinfo/tests/sysinfo_test.py
+++ b/src/lib/python/isc/sysinfo/tests/sysinfo_test.py
@@ -190,7 +190,7 @@ def _my_freebsd_subprocess_check_output(command, faked_output):
         output = faked_output['smp-sysctl']
         if isinstance(output, Exception):
             raise output
-        return faked_output['smp-sysctl']
+        return output
     elif command == ['vmstat', '-H']:
         return b' procs    memory       page                    disks    traps          cpu\n r b w    avm     fre  flt  re  pi  po  fr  sr wd0 cd0  int   sys   cs us sy id\n 0 0 0   343434  123456   47   0   0   0   0   0   2   0    2    80   14  0  1 99\n'
     elif command == ['swapctl', '-s', '-k']:
@@ -277,7 +277,7 @@ class SysInfoTest(unittest.TestCase):
         """Test that SysInfoFromFactory returns a valid system-specific
         SysInfo implementation.
 
-        See sysinfo.SysInfoTestcase() for some ofthe parameters.
+        See sysinfo.SysInfoTestcase() for some of the parameters.
 
         """
 
@@ -293,7 +293,7 @@ class SysInfoTest(unittest.TestCase):
         self.assertEqual('Unknown', s.get_platform_machine())
         self.assertFalse(s.get_platform_is_smp())
         self.assertEqual(131072, s.get_uptime())
-        # We check we do NOT add 's' to 'day' (because it's singular):
+        # We check that we do NOT add 's' to 'day' (because it's singular):
         self.assertEqual('1 day, 12:24', s.get_uptime_desc())
         self.assertEqual(None, s.get_loadavg())
         self.assertEqual(None, s.get_mem_total())
@@ -327,8 +327,8 @@ class SysInfoTest(unittest.TestCase):
         self.assertEqual('myhostname', s.get_platform_hostname())
         self.assertTrue(s.get_platform_is_smp())
         self.assertEqual(172801, s.get_uptime())
-        # We check we add 's' to 'day', and the mm part has an additional
-        # 0, i.e., not '0:0' but '0:00':
+        # We check that we add 's' to 'day', and that the mm part has an
+        # additional 0, i.e., not '0:0' but '0:00':
         self.assertEqual('2 days, 0:00', s.get_uptime_desc())
         self.assertEqual((0.1, 0.2, 0.3), s.get_loadavg())
         self.assertEqual(3157884928, s.get_mem_total())
@@ -409,8 +409,8 @@ class SysInfoTest(unittest.TestCase):
         self.assertEqual(NPROCESSORS_FREEBSD, s.get_num_processors())
         self.assertTrue(s.get_platform_is_smp())
 
-        # We check the kernel SMP support by the availability of an sysctl
-        # variable.  The value (especiall a 0 value) shouldn't matter.
+        # We check the kernel SMP support by the availability of a sysctl
+        # variable.  The value (especially a 0 value) shouldn't matter.
         faked_process_output['smp-sysctl'] = b'0\n'
         s = SysInfoFromFactory()
         self.assertTrue(s.get_platform_is_smp())