[py-svn] r36302 - in py/dist/py/test/rsession: . webdata

[fijal at codespeak.net]

Author: fijal
Date: Mon Jan  8 18:11:35 2007
New Revision: 36302

Modified:
   py/dist/py/test/rsession/web.py
   py/dist/py/test/rsession/webdata/source.js
   py/dist/py/test/rsession/webjs.py
Log:
Fix issue with web tests and something that is not exactly Module


Modified: py/dist/py/test/rsession/web.py
==============================================================================
--- py/dist/py/test/rsession/web.py	(original)
+++ py/dist/py/test/rsession/web.py	Mon Jan  8 18:11:35 2007
@@ -57,11 +57,11 @@
     fullitemname = "/".join(item.listnames())
     d = {'fullitemname': fullitemname, 'itemtype': itemtype,
          'itemname': itemname}
-    if itemtype == 'Module':
-        try:
-            d['length'] = str(len(list(event.item.tryiter())))
-        except:
-            d['length'] = "?"
+    #if itemtype == 'Module':
+    try:
+        d['length'] = str(len(list(event.item.tryiter())))
+    except:
+        d['length'] = "?"
     return d
 
 class MultiQueue(object):
@@ -282,8 +282,8 @@
         self.pending_events.put(event)
     
     def report_ItemStart(self, event):
-        #if isinstance(event.item, py.test.collect.Module):
-        self.pending_events.put(event)
+        if isinstance(event.item, py.test.collect.Module):
+            self.pending_events.put(event)
     
     def report_unknown(self, event):
         # XXX: right now, we just pass it for showing

Modified: py/dist/py/test/rsession/webdata/source.js
==============================================================================
Binary files. No diff available.

Modified: py/dist/py/test/rsession/webjs.py
==============================================================================
--- py/dist/py/test/rsession/webjs.py	(original)
+++ py/dist/py/test/rsession/webjs.py	Mon Jan  8 18:11:35 2007
@@ -140,9 +140,9 @@
     main_t = dom.document.getElementById("main_table")
     if msg['type'] == 'ItemStart':
         # we start a new directory or what
-        if msg['itemtype'] == 'Module':
-            tr = make_module_box(msg)
-            main_t.appendChild(tr)
+        #if msg['itemtype'] == 'Module':
+        tr = make_module_box(msg)
+        main_t.appendChild(tr)
     elif msg['type'] == 'SendItem':
         host_elem = dom.document.getElementById(msg['hostkey'])
         glob.host_pending[msg['hostkey']].insert(0, msg['fullitemname'])