48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#915 Update run-tests.py to the latest changes 

This handles changes in:
- The host of the DB.
- New json config file.
master
Roberto Hueso Gómez 2020-10-07 12:13:54 +02:00 committed by OpenGnSys Support Team
parent 5b1efd0b53
commit 4a06c7a391
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/config/ogserver.json 100644
View File

@ -0,0 +1,20 @@
{
"rest" : {
"ip" : "127.0.0.1",
"port" : "8888",
"api_token": "07b3bfe728954619b58f0107ad73acc1"
},
"database" : {
"ip": "127.0.0.1",
"port": 3306,
"name" : "test-db",
"user" : "test-db",
"pass" : "test-db"
},
"repository" : {
"directory": "/opt/opengnsys/images"
},
"wol" : {
"interface" : "lo"
}
}

6
tests/run-tests.py
View File

@ -4,9 +4,9 @@ import subprocess, glob, os
sql_data = "INSERT INTO aulas (nombreaula, idcentro, urlfoto, grupoid, ubicacion, puestos, modomul, ipmul, pormul, velmul, router, netmask, ntp, dns, proxy, modp2p, timep2p) VALUES ('Aula virtual', 1, 'aula.jpg', 0, 'Despliegue virtual con Vagrant.', 5, 2, '239.194.2.11', 9000, 70, '192.168.56.1', '255.255.255.0', '', '', '', 'peer', 30); INSERT INTO ordenadores (nombreordenador, ip, mac, idaula, idrepositorio, idperfilhard, idmenu, idproautoexec, grupoid, router, mascara, arranque, netiface, netdriver, fotoord) VALUES ('pc2', '192.168.2.1', '0800270E6501', 1, 1, 0, 0, 0, 0, '192.168.56.1', '255.255.255.0', '00unknown', 'eth0', 'generic', 'fotoordenador.gif'), ('pc2', '192.168.2.2', '0800270E6502', 1, 1, 0, 0, 0, 0, '192.168.56.1', '255.255.255.0', '00unknown', 'eth0', 'generic', 'fotoordenador.gif');"
sql_create_user = "CREATE USER 'test-db'@'hostname'; GRANT ALL PRIVILEGES ON *.* To 'test-db'@'hostname' IDENTIFIED BY 'test-db';"
sql_create_user = "CREATE USER 'test-db'@'localhost'; GRANT ALL PRIVILEGES ON *.* To 'test-db'@'localhost' IDENTIFIED BY 'test-db';"
sql_delete_user = "DROP USER 'test-db'@'hostname';"
sql_delete_user = "DROP USER 'test-db'@'localhost';"
def start_mysql():
@ -32,7 +32,7 @@ if os.path.isfile('../ogserver') is not True:
start_mysql();
subprocess.Popen(['../ogserver', '-f', 'config/ogserver.cfg'])
subprocess.Popen(['../ogserver -f config/ogserver.json'], shell=True)
subprocess.run('python3 -m unittest discover -s units -v', shell=True)