IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update regression tests to resolve issues where database/connections were getting mixed up.

Browse Source
This commit is contained in:
Navnath Gadakh
2016-09-22 12:58:38 +01:00
committed by Dave Page
parent f117685d77
commit 1cb5a7c7ca
9 changed files with 201 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py
View File

@@ -30,21 +30,21 @@ class DatabaseAddTestCase(BaseTestGenerator):
def runTest(self):
""" This function will add database under 1st server of tree node. """
self.db_name = ''
server_id = test_server_dict["server"][0]["server_id"]
server_response = server_utils.connect_server(self, server_id)
self.server_id = test_server_dict["server"][0]["server_id"]
server_response = server_utils.connect_server(self, self.server_id)
if server_response["info"] == "Server connected.":
db_owner = server_response['data']['user']['name']
self.data = database_utils.get_db_data(db_owner)
self.db_name = self.data['name']
response = self.tester.post(self.url + str(utils.SERVER_GROUP) +
"/" + str(server_id) + "/",
"/" + str(self.server_id) + "/",
data=json.dumps(self.data),
content_type='html/json')
self.assertEquals(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
db_id = response_data['node']['_id']
db_dict = {"db_id": db_id, "db_name": self.db_name}
utils.write_node_info(int(server_id), "did", db_dict)
utils.write_node_info(int(self.server_id), "did", db_dict)
else:
raise Exception("Error while connecting server to add the"
" database.")
@@ -59,3 +59,4 @@ class DatabaseAddTestCase(BaseTestGenerator):
self.server['host'],
self.server['port'])
utils.drop_database(connection, self.db_name)

3
web/pgadmin/browser/server_groups/servers/databases/tests/utils.py
View File

@@ -10,13 +10,12 @@
import json
import uuid
from regression.test_setup import advanced_config_data
from pgadmin.browser.server_groups.servers.tests import utils as server_utils
from regression import test_utils as utils
DATABASE_URL = '/browser/database/obj/'
DATABASE_CONNECT_URL = 'browser/database/connect/'
DATABASE_CONNECT_URL = '/browser/database/connect/'
def get_db_data(db_owner):

2
web/pgadmin/browser/server_groups/servers/tests/test_server_add.py
View File

@@ -36,4 +36,4 @@ class ServersAddTestCase(BaseTestGenerator):
def tearDown(self):
"""This function delete the server from SQLite """
utils.delete_server(self.server_id)
utils.delete_server(self.tester, self.server_id)

2
web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py
View File

@@ -33,4 +33,4 @@ class ServerDeleteTestCase(BaseTestGenerator):
def tearDown(self):
"""This function delete the server from SQLite """
utils.delete_server(self.server_id)
utils.delete_server(self.tester, self.server_id)

2
web/pgadmin/browser/server_groups/servers/tests/test_server_put.py
View File

@@ -37,4 +37,4 @@ class ServerUpdateTestCase(BaseTestGenerator):
def tearDown(self):
"""This function delete the server from SQLite"""
utils.delete_server(self.server_id)
utils.delete_server(self.tester, self.server_id)

5
web/pgadmin/browser/server_groups/servers/tests/utils.py
View File

@@ -9,14 +9,9 @@
from __future__ import print_function
import sys
import json
import sqlite3
import config
from regression import node_info_dict
from regression import test_utils as utils
from regression.test_setup import config_data
SERVER_URL = '/browser/server/obj/'
SERVER_CONNECT_URL = '/browser/server/connect/'