[pytango] 373/483: Allow to test a sys/database/pydb-test

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 75d48b077cfba7fa55f40862af5375db44745061
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Tue Apr 15 12:17:22 2014 +0000

    Allow to test a sys/database/pydb-test
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@25377 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 src/boost/python/databaseds/DataBaseds    | 2 +-
 src/boost/python/databaseds/create_db.sql | 4 ++--
 src/boost/python/databaseds/database.py   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/boost/python/databaseds/DataBaseds b/src/boost/python/databaseds/DataBaseds
index ecd5a44..e21ac1f 100755
--- a/src/boost/python/databaseds/DataBaseds
+++ b/src/boost/python/databaseds/DataBaseds
@@ -3,7 +3,7 @@
 import database
 
 def main():
-    database.main(embedded=False)
+    database.main(embedded=True)
     
 if __name__ == '__main__':
     main()
diff --git a/src/boost/python/databaseds/create_db.sql b/src/boost/python/databaseds/create_db.sql
index 115754e..16489a2 100644
--- a/src/boost/python/databaseds/create_db.sql
+++ b/src/boost/python/databaseds/create_db.sql
@@ -21,8 +21,8 @@ INSERT INTO object_history_id VALUES (0);
 INSERT INTO device VALUES ('sys/database/2',NULL,'sys','database','2','nada','nada','nada','DataBaseds/2','nada','DataBase','nada','nada','nada','nada');
 INSERT INTO device VALUES ('dserver/DataBaseds/2',NULL,'dserver','DataBaseds','2','nada','nada','nada','DataBaseds/2','nada','DServer','nada','nada','nada','nada');
 
-INSERT INTO device VALUES ('sys/database/pydb-test',NULL,'sys','database','pydb','nada','nada','nada','DataBaseds/pydb','nada','DataBase','nada','nada','nada','nada');
-INSERT INTO device VALUES ('dserver/DataBaseds/pydb-test',NULL,'dserver','DataBaseds','2','nada','nada','nada','DataBaseds/pydb','nada','DServer','nada','nada','nada','nada');
+INSERT INTO device VALUES ('sys/database/pydb-test',NULL,'sys','database','pydb','nada','nada','nada','DataBaseds/pydb-test','nada','DataBase','nada','nada','nada','nada');
+INSERT INTO device VALUES ('dserver/DataBaseds/pydb-test',NULL,'dserver','DataBaseds','2','nada','nada','nada','DataBaseds/pydb-test','nada','DServer','nada','nada','nada','nada');
 
 #
 # Create entry for test device server in device table
diff --git a/src/boost/python/databaseds/database.py b/src/boost/python/databaseds/database.py
index 9eb4e6c..f0cb5a1 100644
--- a/src/boost/python/databaseds/database.py
+++ b/src/boost/python/databaseds/database.py
@@ -2363,7 +2363,7 @@ class DataBaseClass(PyTango.DeviceClass):
 def __run():
     """Runs the Database DS as a standalone database"""
 
-    db_name = "sys/database/" + args[1]
+    db_name = "sys/database/" + sys.argv[1]
     set_db_name(db_name)
 
     PyTango.Util.set_use_db(False)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git