[Buildbot-commits] buildbot/buildbot/status html.py,1.53,1.54

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25684/buildbot/status

Modified Files:
	html.py 
Log Message:
* buildbot/slave/commands.py (ShellCommand.__init__): use os.pathsep

* buildbot/test/test_web.py (WebTest.test_webPortnum): add timeout
(WebTest.test_webPathname): same
(WebTest.test_webPathname_port): same
(WebTest.test_waterfall): use the default favicon rather than rooting around
the filesystem for it. Open the expected-icon file in binary mode, to make
win32 tests happier (thanks to Nick Trout for the catch)
* buildbot/status/html.py (buildbot_icon): win32 portability


Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- html.py	19 Apr 2005 08:22:42 -0000	1.53
+++ html.py	20 Apr 2005 20:13:25 -0000	1.54
@@ -1296,8 +1296,9 @@
             return NoResource("No favicon.ico registered")
         return NoResource("No such Builder '%s'" % path)
 
-# TODO: this hack probably doesn't work under windows
-buildbot_icon = os.path.abspath(sibpath(__file__, "../buildbot.png"))
+# the icon is sibpath(__file__, "../buildbot.png") . This is for portability.
+up = os.path.dirname
+buildbot_icon = os.path.abspath(os.path.join(up(up(__file__)), "buildbot.png"))
 
 class Waterfall(service.MultiService, util.ComparableMixin):
     """I implement the primary web-page status interface, called a 'Waterfall