[py-svn] r51446 - py/branch/event/py/test2/rsession/testing

[hpk at codespeak.net]

Author: hpk
Date: Wed Feb 13 18:12:35 2008
New Revision: 51446

Modified:
   py/branch/event/py/test2/rsession/testing/basetest.py
   py/branch/event/py/test2/rsession/testing/test_hostmanage.py
   py/branch/event/py/test2/rsession/testing/test_masterslave.py
   py/branch/event/py/test2/rsession/testing/test_rsession.py
Log:
minor test setup shuffling 


Modified: py/branch/event/py/test2/rsession/testing/basetest.py
==============================================================================
--- py/branch/event/py/test2/rsession/testing/basetest.py	(original)
+++ py/branch/event/py/test2/rsession/testing/basetest.py	Wed Feb 13 18:12:35 2008
@@ -5,6 +5,14 @@
 import py
 from py.__.test2.testing.setupdata import getexamplefile 
 
+class DirSetup:
+    def setup_method(self, method):
+        name = "%s.%s" %(self.__class__.__name__, method.func_name)
+        self.tmpdir = py.test2.ensuretemp(name)
+        self.source = self.tmpdir.ensure("source", dir=1)
+        self.dest = self.tmpdir.join("dest")
+
+
 class BasicRsessionTest(object):
     def setup_class(cls):
         path = getexamplefile("funcexamples.py")

Modified: py/branch/event/py/test2/rsession/testing/test_hostmanage.py
==============================================================================
--- py/branch/event/py/test2/rsession/testing/test_hostmanage.py	(original)
+++ py/branch/event/py/test2/rsession/testing/test_hostmanage.py	Wed Feb 13 18:12:35 2008
@@ -3,17 +3,11 @@
 """
 
 import py
+from basetest import DirSetup 
 from py.__.test2.rsession.hostmanage import HostRSync, HostInfo, HostManager
 from py.__.test2.rsession.hostmanage import sethomedir, gethomedir, getpath_relto_home
 from py.__.test2 import repevent
 
-class DirSetup:
-    def setup_method(self, method):
-        name = "%s.%s" %(self.__class__.__name__, method.func_name)
-        self.tmpdir = py.test2.ensuretemp(name)
-        self.source = self.tmpdir.ensure("source", dir=1)
-        self.dest = self.tmpdir.join("dest")
-
 class TestHostInfo(DirSetup):
     def _gethostinfo(self, relpath=""):
         exampledir = self.tmpdir.join("gethostinfo")

Modified: py/branch/event/py/test2/rsession/testing/test_masterslave.py
==============================================================================
--- py/branch/event/py/test2/rsession/testing/test_masterslave.py	(original)
+++ py/branch/event/py/test2/rsession/testing/test_masterslave.py	Wed Feb 13 18:12:35 2008
@@ -6,7 +6,7 @@
 from py.__.test2 import repevent 
 
 
-class TestMasterSlaveConnection(BasicRsessionTest):
+class TestMasterSlaveConnection(BasicRsessionTest): 
     def makereportqueue(self, filterevent=repevent.ItemTestReport):
         queue = py.std.Queue.Queue()
         def append(event):

Modified: py/branch/event/py/test2/rsession/testing/test_rsession.py
==============================================================================
--- py/branch/event/py/test2/rsession/testing/test_rsession.py	(original)
+++ py/branch/event/py/test2/rsession/testing/test_rsession.py	Wed Feb 13 18:12:35 2008
@@ -6,8 +6,7 @@
 from py.__.test2 import repevent
 from py.__.test2.rsession.rsession import RSession 
 from py.__.test2.rsession.hostmanage import HostManager, HostInfo
-from py.__.test2.rsession.testing.basetest import BasicRsessionTest
-from py.__.test2.rsession.testing.test_hostmanage import DirSetup
+from basetest import BasicRsessionTest, DirSetup
 
 from py.__.test2.testing import suptest 
 
@@ -36,7 +35,6 @@
                 assert 0
         """))
         config = py.test2.config._reparse([self.source.join("sub"), '-x', '--dist'])
-        #config = py.test2.config._reparse([self.source.join("sub"), '--dist'])
         rsession = RSession(config)
         sorter = suptest.events_from_session(rsession) 
         testevents = sorter.get(repevent.ItemTestReport)