[pypy-svn] r37980 - in pypy/dist/pypy/tool/build: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Feb  5 21:25:24 2007
New Revision: 37980

Added:
   pypy/dist/pypy/tool/build/test/__init__.py
Modified:
   pypy/dist/pypy/tool/build/build.py
   pypy/dist/pypy/tool/build/test/fake.py
   pypy/dist/pypy/tool/build/test/test_build.py
   pypy/dist/pypy/tool/build/test/test_buildserver.py
   pypy/dist/pypy/tool/build/test/test_metaserver.py
   pypy/dist/pypy/tool/build/test/test_pypybuilder.py
Log:
rename FakeClient to FakeBuildserver to be consistent with the rest of the
terminology. clean up imports a bit, pypy tries to not use relative imports.


Modified: pypy/dist/pypy/tool/build/build.py
==============================================================================
--- pypy/dist/pypy/tool/build/build.py	(original)
+++ pypy/dist/pypy/tool/build/build.py	Mon Feb  5 21:25:24 2007
@@ -122,7 +122,7 @@
                 self.svnrev, self.revrange)
 
     def serialize(self):
-        data = {'normalized_rev': self.normalized_rev}
+        data = {'normalized_rev': self.normalized_rev} # it's a property
         data.update(self.__dict__)
         return """\
 email: %(email)s

Added: pypy/dist/pypy/tool/build/test/__init__.py
==============================================================================

Modified: pypy/dist/pypy/tool/build/test/fake.py
==============================================================================
--- pypy/dist/pypy/tool/build/test/fake.py	(original)
+++ pypy/dist/pypy/tool/build/test/fake.py	Mon Feb  5 21:25:24 2007
@@ -16,7 +16,7 @@
     def waitclose(self):
         pass
 
-class FakeClient(object):
+class FakeBuildserver(object):
     def __init__(self, info):
         self.channel = FakeChannel()
         self.sysinfo = info

Modified: pypy/dist/pypy/tool/build/test/test_build.py
==============================================================================
--- pypy/dist/pypy/tool/build/test/test_build.py	(original)
+++ pypy/dist/pypy/tool/build/test/test_build.py	Mon Feb  5 21:25:24 2007
@@ -1,8 +1,8 @@
 import py
-from pypy.tool.build import build
 from py.__.misc.cache import AgingCache
 from py.__.path.svn import urlcommand
-from repo import create_temp_repo
+from pypy.tool.build import build
+from pypy.tool.build.test.repo import create_temp_repo
 
 def setup_module(mod):
     # remove nasty cache from py.path.svnurl to allow this to work...

Modified: pypy/dist/pypy/tool/build/test/test_buildserver.py
==============================================================================
--- pypy/dist/pypy/tool/build/test/test_buildserver.py	(original)
+++ pypy/dist/pypy/tool/build/test/test_buildserver.py	Mon Feb  5 21:25:24 2007
@@ -1,12 +1,13 @@
-import path
-from pypy.tool.build import buildserver
-from pypy.tool.build import build
 import py
-import time
+import path
 import sys
-from zipfile import ZipFile
 from StringIO import StringIO
-from fake import FakeChannel, FakeMetaServer
+import time
+from zipfile import ZipFile
+
+from pypy.tool.build import buildserver
+from pypy.tool.build import build
+from pypy.tool.build.test.fake import FakeChannel, FakeMetaServer
 
 class BuildServerForTests(buildserver.BuildServer):
     def __init__(self, *args, **kwargs):

Modified: pypy/dist/pypy/tool/build/test/test_metaserver.py
==============================================================================
--- pypy/dist/pypy/tool/build/test/test_metaserver.py	(original)
+++ pypy/dist/pypy/tool/build/test/test_metaserver.py	Mon Feb  5 21:25:24 2007
@@ -1,10 +1,11 @@
+import py
 import path
+import time
+
 from pypy.tool.build import metaserver
-import py
-from fake import FakeChannel, FakeClient, Container
+from pypy.tool.build.test.fake import FakeChannel, FakeBuildserver, Container
 from pypy.tool.build import build
-import time
-from repo import create_temp_repo
+from pypy.tool.build.test.repo import create_temp_repo
 
 def setup_module(mod):
     mod.temppath = temppath = py.test.ensuretemp('pypybuilder-server')
@@ -12,10 +13,10 @@
                        mailhost=None)
     mod.svr = metaserver.MetaServer(config, FakeChannel())
     
-    mod.c1 = FakeClient({'foo': 1, 'bar': [1,2]})
+    mod.c1 = FakeBuildserver({'foo': 1, 'bar': [1,2]})
     mod.svr.register(mod.c1)
 
-    mod.c2 = FakeClient({'foo': 2, 'bar': [2,3]})
+    mod.c2 = FakeBuildserver({'foo': 2, 'bar': [2,3]})
     mod.svr.register(mod.c2)
 
 def test_server_issubdict():

Modified: pypy/dist/pypy/tool/build/test/test_pypybuilder.py
==============================================================================
--- pypy/dist/pypy/tool/build/test/test_pypybuilder.py	(original)
+++ pypy/dist/pypy/tool/build/test/test_pypybuilder.py	Mon Feb  5 21:25:24 2007
@@ -11,8 +11,8 @@
 from pypy.tool.build.conftest import option
 from pypy.config import config as pypyconfig
 
-from repo import create_temp_repo
-from fake import Container
+from pypy.tool.build.test.repo import create_temp_repo
+from pypy.tool.build.test.fake import Container
 
 # XXX this one is a bit messy, it's a quick functional test for the whole
 # system, but for instance contains time.sleep()s to make sure all threads