[cpif] r40 - in trunk: frontend-web tests

[svn at argo.es]

Author: jcea
Date: Fri May 11 16:49:09 2007
New Revision: 40

Log:


Modified:
   trunk/frontend-web/init.py
   trunk/tests/ejemplo1.py
   trunk/tests/ejemplo2.py

Modified: trunk/frontend-web/init.py
==============================================================================
--- trunk/frontend-web/init.py	(original)
+++ trunk/frontend-web/init.py	Fri May 11 16:49:09 2007
@@ -1,16 +1,15 @@
 # $Id$
 
 def main() :
-  from globales import monitor
-  from servidor_web import servidor_web
+  import globales
 
   import os.path,sys
   directorio_padre=os.path.split(os.getcwd())[0]  # Directorio padre
   sys.path.append(os.path.join(directorio_padre,"backend"))
 
-  print sys.path
   import storage
-  dummy,dummy,monitor=storage.storage_and_monitor("db")
+  dummy,dummy,monitor=storage.storage_and_monitor(os.path.join(os.path.pardir,"backend","db"))
+  globales.monitor=monitor
 
   import database
 
@@ -25,6 +24,7 @@
   inicializa()
 
 # Lanzamos el servidor web en un hilo separado
+  from servidor_web import servidor_web
   import threading
   t=threading.Thread(target=servidor_web)
   t.setDaemon(True)

Modified: trunk/tests/ejemplo1.py
==============================================================================
--- trunk/tests/ejemplo1.py	(original)
+++ trunk/tests/ejemplo1.py	Fri May 11 16:49:09 2007
@@ -23,7 +23,7 @@
 from durus.persistent_dict import PersistentDict 
 
 import storage
-dummy,dummy,monitor=storage.storage_and_monitor("db-test",storage=storage.storage_test)
+dummy,dummy,monitor=storage.storage_and_monitor(os.path.join("backend","db-test"),storage=storage.storage_test)
 
 # La numeracion de los mensajes es global. 
 # Lo primero es crear el arbol de actualizacion de hilos 

Modified: trunk/tests/ejemplo2.py
==============================================================================
--- trunk/tests/ejemplo2.py	(original)
+++ trunk/tests/ejemplo2.py	Fri May 11 16:49:09 2007
@@ -19,7 +19,7 @@
 
 
 import storage
-dummy,dummy,monitor=storage.storage_and_monitor("db-test",storage=storage.storage_test)
+dummy,dummy,monitor=storage.storage_and_monitor(os.path.join("backend","db-test"),storage=storage.storage_test)
 
 import database