Browse Source

[trac930] remove tailing whitespaces.

Naoki Kambe 13 years ago
parent
commit
3516ab5518

+ 1 - 1
src/bin/stats/b10-stats-httpd.xml

@@ -132,7 +132,7 @@
   <refsect1>
   <refsect1>
     <title>CONFIGURATION AND COMMANDS</title>
     <title>CONFIGURATION AND COMMANDS</title>
     <para>
     <para>
-      The configurable setting in 
+      The configurable setting in
       <filename>stats-httpd.spec</filename> is:
       <filename>stats-httpd.spec</filename> is:
     </para>
     </para>
     <variablelist>
     <variablelist>

+ 1 - 1
src/bin/stats/stats_httpd.py.in

@@ -415,7 +415,7 @@ class StatsHttpd:
                 annotation.append(documentation)
                 annotation.append(documentation)
                 element.append(annotation)
                 element.append(annotation)
                 alltag.append(element)
                 alltag.append(element)
-        
+
             complextype = xml.etree.ElementTree.Element("complexType")
             complextype = xml.etree.ElementTree.Element("complexType")
             complextype.append(alltag)
             complextype.append(alltag)
             mod_element = xml.etree.ElementTree.Element("element", { "name" : mod })
             mod_element = xml.etree.ElementTree.Element("element", { "name" : mod })

+ 1 - 1
src/bin/stats/tests/Makefile.am

@@ -13,7 +13,7 @@ endif
 # test using command-line arguments, so use check-local target instead of TESTS
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 check-local:
 if ENABLE_PYTHON_COVERAGE
 if ENABLE_PYTHON_COVERAGE
-	touch $(abs_top_srcdir)/.coverage 
+	touch $(abs_top_srcdir)/.coverage
 	rm -f .coverage
 	rm -f .coverage
 	${LN_S} $(abs_top_srcdir)/.coverage .coverage
 	${LN_S} $(abs_top_srcdir)/.coverage .coverage
 endif
 endif

+ 5 - 5
src/bin/stats/tests/b10-stats-httpd_test.py

@@ -30,7 +30,7 @@ import stats_httpd
 import stats
 import stats
 from test_utils import BaseModules, ThreadingServerManager, MyStats, MyStatsHttpd, TIMEOUT_SEC
 from test_utils import BaseModules, ThreadingServerManager, MyStats, MyStatsHttpd, TIMEOUT_SEC
 
 
-# set test name for logger 
+# set test name for logger
 isc.log.init("b10-stats-httpd_test")
 isc.log.init("b10-stats-httpd_test")
 
 
 DUMMY_DATA = {
 DUMMY_DATA = {
@@ -364,7 +364,7 @@ class TestStatsHttpd(unittest.TestCase):
             for ht in self.stats_httpd.httpd:
             for ht in self.stats_httpd.httpd:
                 self.assertTrue(isinstance(ht.socket, socket.socket))
                 self.assertTrue(isinstance(ht.socket, socket.socket))
             self.stats_httpd.close_httpd()
             self.stats_httpd.close_httpd()
-    
+
         # dual stack (address is ipv4)
         # dual stack (address is ipv4)
         if self.ipv6_enabled:
         if self.ipv6_enabled:
             self.stats_httpd.http_addrs = [ ('127.0.0.1', 8000) ]
             self.stats_httpd.http_addrs = [ ('127.0.0.1', 8000) ]
@@ -380,20 +380,20 @@ class TestStatsHttpd(unittest.TestCase):
             for ht in self.stats_httpd.httpd:
             for ht in self.stats_httpd.httpd:
                 self.assertTrue(isinstance(ht.socket, socket.socket))
                 self.assertTrue(isinstance(ht.socket, socket.socket))
             self.stats_httpd.close_httpd()
             self.stats_httpd.close_httpd()
-    
+
         # only-ipv4 single stack (force set ipv6 )
         # only-ipv4 single stack (force set ipv6 )
         if not self.ipv6_enabled:
         if not self.ipv6_enabled:
             self.stats_httpd.http_addrs = [ ('::1', 8000) ]
             self.stats_httpd.http_addrs = [ ('::1', 8000) ]
             self.assertRaises(stats_httpd.HttpServerError,
             self.assertRaises(stats_httpd.HttpServerError,
                               self.stats_httpd.open_httpd)
                               self.stats_httpd.open_httpd)
-    
+
         # hostname
         # hostname
         self.stats_httpd.http_addrs = [ ('localhost', 8000) ]
         self.stats_httpd.http_addrs = [ ('localhost', 8000) ]
         self.stats_httpd.open_httpd()
         self.stats_httpd.open_httpd()
         for ht in self.stats_httpd.httpd:
         for ht in self.stats_httpd.httpd:
             self.assertTrue(isinstance(ht.socket, socket.socket))
             self.assertTrue(isinstance(ht.socket, socket.socket))
         self.stats_httpd.close_httpd()
         self.stats_httpd.close_httpd()
-    
+
         self.stats_httpd.http_addrs = [ ('my.host.domain', 8000) ]
         self.stats_httpd.http_addrs = [ ('my.host.domain', 8000) ]
         self.assertRaises(stats_httpd.HttpServerError, self.stats_httpd.open_httpd)
         self.assertRaises(stats_httpd.HttpServerError, self.stats_httpd.open_httpd)
         self.assertEqual(type(self.stats_httpd.httpd), list)
         self.assertEqual(type(self.stats_httpd.httpd), list)

+ 8 - 8
src/bin/stats/tests/b10-stats_test.py

@@ -24,7 +24,7 @@ import stats
 import isc.cc.session
 import isc.cc.session
 from test_utils import BaseModules, ThreadingServerManager, MyStats, send_command, TIMEOUT_SEC
 from test_utils import BaseModules, ThreadingServerManager, MyStats, send_command, TIMEOUT_SEC
 
 
-# set test name for logger 
+# set test name for logger
 isc.log.init("b10-stats_test")
 isc.log.init("b10-stats_test")
 
 
 class TestUtilties(unittest.TestCase):
 class TestUtilties(unittest.TestCase):
@@ -205,19 +205,19 @@ class TestStats(unittest.TestCase):
         self.base.boss.server._started.wait()
         self.base.boss.server._started.wait()
         self.assertEqual(
         self.assertEqual(
             send_command(
             send_command(
-                'show', 'Stats', 
+                'show', 'Stats',
                 params={ 'owner' : 'Boss',
                 params={ 'owner' : 'Boss',
                   'name'  : 'boot_time' }),
                   'name'  : 'boot_time' }),
             (0, '2011-06-22T08:14:08Z'))
             (0, '2011-06-22T08:14:08Z'))
         self.assertEqual(
         self.assertEqual(
             send_command(
             send_command(
-                'set', 'Stats', 
+                'set', 'Stats',
                 params={ 'owner' : 'Boss',
                 params={ 'owner' : 'Boss',
                   'data'  : { 'boot_time' : '2012-06-22T18:24:08Z' } }),
                   'data'  : { 'boot_time' : '2012-06-22T18:24:08Z' } }),
             (0, None))
             (0, None))
         self.assertEqual(
         self.assertEqual(
             send_command(
             send_command(
-                'show', 'Stats', 
+                'show', 'Stats',
                 params={ 'owner' : 'Boss',
                 params={ 'owner' : 'Boss',
                   'name'  : 'boot_time' }),
                   'name'  : 'boot_time' }),
             (0, '2012-06-22T18:24:08Z'))
             (0, '2012-06-22T18:24:08Z'))
@@ -267,7 +267,7 @@ class TestStats(unittest.TestCase):
             self.assertTrue('item_description' in item)
             self.assertTrue('item_description' in item)
             if len(item) == 7:
             if len(item) == 7:
                 self.assertTrue('item_format' in item)
                 self.assertTrue('item_format' in item)
-        
+
         self.assertEqual(
         self.assertEqual(
             send_command('__UNKNOWN__', 'Stats'),
             send_command('__UNKNOWN__', 'Stats'),
             (1, "Unknown command: '__UNKNOWN__'"))
             (1, "Unknown command: '__UNKNOWN__'"))
@@ -340,13 +340,13 @@ class TestStats(unittest.TestCase):
         self.assertEqual(self.stats.command_status(),
         self.assertEqual(self.stats.command_status(),
                 isc.config.create_answer(
                 isc.config.create_answer(
                 0, "Stats is up. (PID " + str(os.getpid()) + ")"))
                 0, "Stats is up. (PID " + str(os.getpid()) + ")"))
-        
+
     def test_command_shutdown(self):
     def test_command_shutdown(self):
         self.stats.running = True
         self.stats.running = True
         self.assertEqual(self.stats.command_shutdown(),
         self.assertEqual(self.stats.command_shutdown(),
                          isc.config.create_answer(0))
                          isc.config.create_answer(0))
         self.assertFalse(self.stats.running)
         self.assertFalse(self.stats.running)
-        
+
     def test_command_show(self):
     def test_command_show(self):
         self.assertEqual(self.stats.command_show(owner='Foo', name=None),
         self.assertEqual(self.stats.command_show(owner='Foo', name=None),
                          isc.config.create_answer(
                          isc.config.create_answer(
@@ -380,7 +380,7 @@ class TestStats(unittest.TestCase):
               "statistics": [] } )
               "statistics": [] } )
         self.assertRaises(
         self.assertRaises(
             stats.StatsError, self.stats.command_show, owner='Foo', name='bar')
             stats.StatsError, self.stats.command_show, owner='Foo', name='bar')
-        
+
     def test_command_showchema(self):
     def test_command_showchema(self):
         (rcode, value) = isc.config.ccsession.parse_answer(
         (rcode, value) = isc.config.ccsession.parse_answer(
             self.stats.command_showschema())
             self.stats.command_showschema())

+ 4 - 4
src/bin/stats/tests/test_utils.py

@@ -10,7 +10,7 @@ import threading
 import tempfile
 import tempfile
 
 
 import msgq
 import msgq
-import isc.config.cfgmgr 
+import isc.config.cfgmgr
 import stats
 import stats
 import stats_httpd
 import stats_httpd
 
 
@@ -49,7 +49,7 @@ class ThreadingServerManager:
         self.server._thread = threading.Thread(
         self.server._thread = threading.Thread(
             name=self.server_class_name, target=self.server.run)
             name=self.server_class_name, target=self.server.run)
         self.server._thread.daemon = True
         self.server._thread.daemon = True
-        
+
     def run(self):
     def run(self):
         self.server._thread.start()
         self.server._thread.start()
         self.server._started.wait()
         self.server._started.wait()
@@ -94,7 +94,7 @@ class MockCfgmgr:
 
 
     def shutdown(self):
     def shutdown(self):
         self.cfgmgr.running = False
         self.cfgmgr.running = False
-            
+
 class MockBoss:
 class MockBoss:
     spec_str = """\
     spec_str = """\
 {
 {
@@ -157,7 +157,7 @@ class MockBoss:
             params = { "owner": "Boss",
             params = { "owner": "Boss",
                        "data": {
                        "data": {
                     'boot_time': time.strftime('%Y-%m-%dT%H:%M:%SZ', self._BASETIME)
                     'boot_time': time.strftime('%Y-%m-%dT%H:%M:%SZ', self._BASETIME)
-                    } 
+                    }
                        }
                        }
             return send_command("set", "Stats", params=params, session=self.cc_session)
             return send_command("set", "Stats", params=params, session=self.cc_session)
         return isc.config.create_answer(1, "Unknown Command")
         return isc.config.create_answer(1, "Unknown Command")

+ 1 - 1
src/bin/tests/Makefile.am

@@ -14,7 +14,7 @@ endif
 # test using command-line arguments, so use check-local target instead of TESTS
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 check-local:
 if ENABLE_PYTHON_COVERAGE
 if ENABLE_PYTHON_COVERAGE
-	touch $(abs_top_srcdir)/.coverage 
+	touch $(abs_top_srcdir)/.coverage
 	rm -f .coverage
 	rm -f .coverage
 	${LN_S} $(abs_top_srcdir)/.coverage .coverage
 	${LN_S} $(abs_top_srcdir)/.coverage .coverage
 endif
 endif