[pypy-svn] r39032 - in pypy/branch/guido-buildtool-web/pypy/tool/build: . templates test web web/templates web/test

guido at codespeak.net guido at codespeak.net
Fri Feb 16 17:39:40 CET 2007


Author: guido
Date: Fri Feb 16 17:39:40 2007
New Revision: 39032

Added:
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/   (props changed)
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/__init__.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/conftest.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/
      - copied from r39027, pypy/branch/guido-buildtool-web/pypy/tool/build/templates/
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/builderinfo.html
      - copied unchanged from r39031, pypy/branch/guido-buildtool-web/pypy/tool/build/templates/builderinfo.html
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/buildersinfo.html
      - copied unchanged from r39031, pypy/branch/guido-buildtool-web/pypy/tool/build/templates/buildersinfo.html
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/builds.html
      - copied unchanged from r39031, pypy/branch/guido-buildtool-web/pypy/tool/build/templates/builds.html
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/index.html
      - copied unchanged from r39031, pypy/branch/guido-buildtool-web/pypy/tool/build/templates/index.html
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/serverstatus.html
      - copied unchanged from r39031, pypy/branch/guido-buildtool-web/pypy/tool/build/templates/serverstatus.html
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/test/   (props changed)
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/test/__init__.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/test/test_webapp.py   (contents, props changed)
      - copied, changed from r39030, pypy/branch/guido-buildtool-web/pypy/tool/build/test/test_webapp.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/test/test_webserver.py   (contents, props changed)
      - copied, changed from r39031, pypy/branch/guido-buildtool-web/pypy/tool/build/test/test_webserver.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/webapp.py   (contents, props changed)
      - copied, changed from r39030, pypy/branch/guido-buildtool-web/pypy/tool/build/webapp.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/web/webserver.py   (props changed)
      - copied unchanged from r39030, pypy/branch/guido-buildtool-web/pypy/tool/build/webserver.py
Removed:
   pypy/branch/guido-buildtool-web/pypy/tool/build/templates/
   pypy/branch/guido-buildtool-web/pypy/tool/build/test/test_webapp.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/test/test_webserver.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/webapp.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/webserver.py
Modified:
   pypy/branch/guido-buildtool-web/pypy/tool/build/build.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/conftest.py
   pypy/branch/guido-buildtool-web/pypy/tool/build/test/__init__.py   (props changed)
Log:
Moved web-related stuff to a seperate dir, fixed a problem with BuildRequest's
__repr__ (interpolation bug).


Modified: pypy/branch/guido-buildtool-web/pypy/tool/build/build.py
==============================================================================
--- pypy/branch/guido-buildtool-web/pypy/tool/build/build.py	(original)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/build.py	Fri Feb 16 17:39:40 2007
@@ -103,16 +103,18 @@
         holds information about a build request, and some functionality to
         serialize and unserialize itself
     """
-    def __init__(self, email, sysinfo, compileinfo, svnurl, svnrev, revrange):
+    def __init__(self, email, sysinfo, compileinfo, svnurl, svnrev, revrange,
+                 request_time=None, build_start_time=None,
+                 build_end_time=None):
         self.email = email
         self.sysinfo = sysinfo
         self.compileinfo = compileinfo
         self.svnurl = svnurl
         self.svnrev = svnrev
         self.revrange = revrange
-        self.request_time = py.std.time.time()
-        self.build_start_time = None
-        self.build_end_time = None
+        self.request_time = request_time or py.std.time.time()
+        self.build_start_time = build_start_time
+        self.build_end_time = build_end_time
 
     def __str__(self):
         return '<BuildRequest %s:%s>' % (self.svnurl, self.normalized_rev)
@@ -120,7 +122,7 @@
     def __repr__(self):
         """ the result of this method can be exec-ed when build.py is imported
         """
-        return 'build.BuildRequest(%r, %r, %r, %r, %r, %r)' % (
+        return 'build.BuildRequest(%r, %r, %r, %r, %r, %r, %s, %s, %s)' % (
                 self.email, self.sysinfo, self.compileinfo, self.svnurl,
                 self.svnrev, self.revrange, self.request_time,
                 self.build_start_time, self.build_end_time)

Modified: pypy/branch/guido-buildtool-web/pypy/tool/build/conftest.py
==============================================================================
--- pypy/branch/guido-buildtool-web/pypy/tool/build/conftest.py	(original)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/conftest.py	Fri Feb 16 17:39:40 2007
@@ -9,15 +9,11 @@
                action="store_true", dest="functional", default=False,
                help="run pypybuilder functional tests"
         ),
-        Option('', '--webcheck',
-               action="store_true", dest="webcheck", default=False,
-               help=("run (X)HTML validity tests (using "
-                     "http://www.w3c.org/validator)")
-        ),
 )
 
 class Directory(Dir):
     def run(self):
         if self.fspath == mypath:
-            return ['test']
+            return ['test', 'web']
         return super(Directory, self).run()
+

Added: pypy/branch/guido-buildtool-web/pypy/tool/build/web/__init__.py
==============================================================================
--- (empty file)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/__init__.py	Fri Feb 16 17:39:40 2007
@@ -0,0 +1 @@
+#

Added: pypy/branch/guido-buildtool-web/pypy/tool/build/web/conftest.py
==============================================================================
--- (empty file)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/conftest.py	Fri Feb 16 17:39:40 2007
@@ -0,0 +1,12 @@
+import py
+from py.__.doc.conftest import Directory as Dir, DoctestText, \
+                                            ReSTChecker
+Option = py.test.config.Option
+option = py.test.config.addoptions("pypybuilder test options",
+        Option('', '--webcheck',
+               action="store_true", dest="webcheck", default=False,
+               help=("run (X)HTML validity tests (using "
+                     "http://www.w3c.org/validator)")
+        ),
+)
+

Added: pypy/branch/guido-buildtool-web/pypy/tool/build/web/test/__init__.py
==============================================================================
--- (empty file)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/test/__init__.py	Fri Feb 16 17:39:40 2007
@@ -0,0 +1 @@
+#



More information about the Pypy-commit mailing list