[py-svn] r48309 - in py/branch/reporter-merge/py/test: . rsession rsession/testing testing

[fijal at codespeak.net]

Author: fijal
Date: Mon Nov  5 11:11:55 2007
New Revision: 48309

Modified:
   py/branch/reporter-merge/py/test/executor.py
   py/branch/reporter-merge/py/test/rsession/testing/test_rsession.py
   py/branch/reporter-merge/py/test/rsession/web.py
   py/branch/reporter-merge/py/test/testing/test_boxing.py
   py/branch/reporter-merge/py/test/testing/test_reporter.py
Log:
I hate .pyc, I hate .pyc, I hate .pyc


Modified: py/branch/reporter-merge/py/test/executor.py
==============================================================================
--- py/branch/reporter-merge/py/test/executor.py	(original)
+++ py/branch/reporter-merge/py/test/executor.py	Mon Nov  5 11:11:55 2007
@@ -4,7 +4,7 @@
 import py, os, sys
 
 from py.__.test.outcome import SerializableOutcome, ReprOutcome
-from py.__.test.rsession.box import Box
+from py.__.test.box import Box
 from py.__.test import repevent
 from py.__.test.outcome import Skipped, Failed
 import py.__.test.custompdb

Modified: py/branch/reporter-merge/py/test/rsession/testing/test_rsession.py
==============================================================================
--- py/branch/reporter-merge/py/test/rsession/testing/test_rsession.py	(original)
+++ py/branch/reporter-merge/py/test/rsession/testing/test_rsession.py	Mon Nov  5 11:11:55 2007
@@ -129,7 +129,7 @@
         hm = HostManager(self.config, hosts=hosts)
         nodes = hm.setup_hosts(allevents.append)
         
-        from py.__.test.rsession.testing.test_executor \
+        from py.__.test.testing.test_executor \
             import ItemTestPassing, ItemTestFailing, ItemTestSkipping
         
         itempass = self.getexample("pass")

Modified: py/branch/reporter-merge/py/test/rsession/web.py
==============================================================================
--- py/branch/reporter-merge/py/test/rsession/web.py	(original)
+++ py/branch/reporter-merge/py/test/rsession/web.py	Mon Nov  5 11:11:55 2007
@@ -218,7 +218,10 @@
             args['fullmodulename'] = str(mod_fullname)
             fullitemname = args['fullitemname']
             if outcome.skipped:
-                self.skip_reasons[fullitemname] = outcome.skipped
+                self.skip_reasons[fullitemname] = self.repr_failure_tblong(
+                    event.item,
+                    outcome.skipped,
+                    outcome.skipped.traceback)
             elif outcome.excinfo:
                 self.fail_reasons[fullitemname] = self.repr_failure_tblong(
                     event.item, outcome.excinfo, outcome.excinfo.traceback)

Modified: py/branch/reporter-merge/py/test/testing/test_boxing.py
==============================================================================
--- py/branch/reporter-merge/py/test/testing/test_boxing.py	(original)
+++ py/branch/reporter-merge/py/test/testing/test_boxing.py	Mon Nov  5 11:11:55 2007
@@ -7,8 +7,8 @@
 if sys.platform == 'win32':
     py.test.skip("rsession is unsupported on Windows.")
 
-from py.__.test.rsession.box import Box
-from py.__.test.rsession.testing import example2
+from py.__.test.box import Box
+from py.__.test.testing import example2
 
 def setup_module(mod):
     tmpdir = py.test.ensuretemp("boxtests")

Modified: py/branch/reporter-merge/py/test/testing/test_reporter.py
==============================================================================
--- py/branch/reporter-merge/py/test/testing/test_reporter.py	(original)
+++ py/branch/reporter-merge/py/test/testing/test_reporter.py	Mon Nov  5 11:11:55 2007
@@ -23,7 +23,7 @@
 from py.__.test import repevent
 from py.__.test.outcome import ReprOutcome, SerializableOutcome
 from py.__.test.rsession.hostmanage import HostInfo
-from py.__.test.rsession.box import Box
+from py.__.test.box import Box
 from py.__.test.rsession.testing.basetest import BasicRsessionTest
 import sys
 from StringIO import StringIO