[pypy-svn] r41416 - in pypy/dist/pypy/translator/js/examples/console: . test

[fijal at codespeak.net]

Author: fijal
Date: Mon Mar 26 19:25:14 2007
New Revision: 41416

Added:
   pypy/dist/pypy/translator/js/examples/console/test/test_snippets.py
Modified:
   pypy/dist/pypy/translator/js/examples/console/console.py
   pypy/dist/pypy/translator/js/examples/console/docloader.py
   pypy/dist/pypy/translator/js/examples/console/test/test_docloader.py
Log:
Move play1_snippets here. An obscure hack to prevent cli tests from running.


Modified: pypy/dist/pypy/translator/js/examples/console/console.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/console/console.py	(original)
+++ pypy/dist/pypy/translator/js/examples/console/console.py	Mon Mar 26 19:25:14 2007
@@ -49,7 +49,9 @@
     def __init__(self):
         self.sessions = {}
         self.updating = {}
-        self.docloader = DocLoader(docdir=DOCDIR, consoles=CONSOLES)
+        testfile = py.path.local(__file__).dirpath().join("play1_snippets.py")
+        self.docloader = DocLoader(docdir=DOCDIR, consoles=CONSOLES,
+                                   testfile=testfile)
 
     def new_session(self, python="python"):
         if not py.path.local().sysfind(python):

Modified: pypy/dist/pypy/translator/js/examples/console/docloader.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/console/docloader.py	(original)
+++ pypy/dist/pypy/translator/js/examples/console/docloader.py	Mon Mar 26 19:25:14 2007
@@ -6,11 +6,11 @@
 import py
 
 class DocLoader(object):
-    def __init__(self, consoles, docdir, testfile='test_snippets.py'):
+    def __init__(self, consoles, docdir, testfile):
         self.consoles = consoles
         self.docdir = py.path.local(docdir)
         assert self.docdir.check(dir=1)
-        self.testfile = self.docdir.join(testfile)
+        self.testfile = testfile
         assert self.testfile.check()
         self.htmls = {}
         self.snippets = {}

Modified: pypy/dist/pypy/translator/js/examples/console/test/test_docloader.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/console/test/test_docloader.py	(original)
+++ pypy/dist/pypy/translator/js/examples/console/test/test_docloader.py	Mon Mar 26 19:25:14 2007
@@ -11,6 +11,6 @@
         def test_snippet_1(self):
             x = 1
     ''')) + '\n')
-    ld = DocLoader(docdir=tmpdir, consoles=['one'], testfile='test_snippets2.py')
+    ld = DocLoader(docdir=tmpdir, consoles=['one'], testfile=tmpdir.join('test_snippets2.py'))
     assert ld.get_html('one') == "<a href='dupa'>x = 1</a>"
     assert ld.get_snippet('one', 0) == 'x = 1'

Added: pypy/dist/pypy/translator/js/examples/console/test/test_snippets.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/translator/js/examples/console/test/test_snippets.py	Mon Mar 26 19:25:14 2007
@@ -0,0 +1,3 @@
+from pypy.translator.js.examples.console.play1_snippets import *
+
+del AppTest_pypy_cli