public inbox for [email protected]
help / color / mirror / Atom feedFrom: Navnath Gadakh <[email protected]>
To: Dave Page <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Cc: Kanchan Mohitey <[email protected]>
Subject: Re: pgAdmin IV : Unittest modular patch
Date: Wed, 27 Jul 2016 17:49:20 +0530
Message-ID: <CAOAJCYpcye6nQAPB8os9vZXOhAf9wEvr6rA9i4vuZLDVrRYF0g@mail.gmail.com> (raw)
In-Reply-To: <CA+OCxoxm9_f5PJVLhwrSk6bozmivv_-=o+spffXjkYk+qPDKeg@mail.gmail.com>
References: <CAOAJCYrcxBN2J_3dWq0Cwc82fkugzUi3NKD4jKoTKRBot=ev8w@mail.gmail.com>
<CAOAJCYpSBXcfEC5d4Sv_=jV86m1=rKUK0tMkZFhdSHkPb=XT3A@mail.gmail.com>
<CA+OCxowW0wjpNT-o0YF1Bg9rtD6Z7sqp35ZRUgoEguVKO4OtSw@mail.gmail.com>
<CAOAJCYr1JwYK4x2wDYw2UVAZoXC5a0FQT7Yz1Y_Wn46kzPMmQg@mail.gmail.com>
<CA+OCxoxqahNgLmvQqqErQZL2JS0EaQwyXkgkzvkFtGNh0OKV6w@mail.gmail.com>
<CAOAJCYqQQ4MaudVaVwfcateuxum-W39HwRiEorhYP8zbqjxN0g@mail.gmail.com>
<CA+OCxozZVCwB4t6hXjMeHbBV8Fx1cm_Cg1tknjWyYxLFZNYsEQ@mail.gmail.com>
<CAFOhELes8Vu_VciiVu31wfaYtTuCFUReEF1mfNXB4nSMcTNrHA@mail.gmail.com>
<CAOAJCYpY=u4T38s+XqQDOky10e7A_Wb_q9bbiwhx_=eF-6i-dQ@mail.gmail.com>
<CA+OCxoxm9_f5PJVLhwrSk6bozmivv_-=o+spffXjkYk+qPDKeg@mail.gmail.com>
List-Unsubscribe: <mailto:[email protected]?body=unsub%20pgadmin-hackers>
Hi Dave,
We have reproduced the issue you mentioned in the previous
email. We need to skip the login related test cases when SERVER_MODE =
False in the web/config_local.py.
Please find the revised patch for the same.
Thanks!
On Fri, Jul 22, 2016 at 9:48 PM, Dave Page <[email protected]> wrote:
> Hi
>
> On Fri, Jul 22, 2016 at 2:22 PM, Navnath Gadakh
> <[email protected]> wrote:
>> Hi Dave,
>>
>> Please find the attached patch for pgAdmin4 unittest(Support of API
>> testing with different servers i.e. PG and PPAS).
>>
>> This patch includes-
>>
>> Test framework support API testing with multiple server for this we need to
>> modify test_config.json(for user it’s test_config.json.in) and
>> test_advanced_config.json(for user it’s test_advanced_config.json.in).
>> Server details of PG and PPAS are included in both .in files.
>>
>> Removed the logic of logging in the test client on each test scenario(As
>> per Khushboo's comment in previous email). We need this logic in test cases
>> under ‘browser/tests/’ as for test scenarios like change password and
>> invalid login test cases as test client should be logged out first. So, as
>> per this the code is slightly modified in ‘browser/tests/’.
>
> OK in principle, but it doesn't seem to work:
>
> This function will add the server under default server group. (Default
> Server Node url) ... ok
>
> ======================================================================
> FAIL: runTest (pgadmin.browser.tests.test_reset_password.ResetPasswordTestCase)
> This function checks reset password functionality. (TestCase for
> Validating Empty Email)
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/Users/dpage/git/pgadmin4/web/pgadmin/browser/tests/test_reset_password.py",
> line 44, in runTest
> 'utf-8'))
> AssertionError: 'Recover pgAdmin 4 Password' not found in u'<!DOCTYPE
> HTML PUBLIC "-//W3C//DTD HTML 3.2
> Final//EN">\n<title>Redirecting...</title>\n<h1>Redirecting...</h1>\n<p>You
> should be redirected automatically to target URL: <a href="/">/</a>.
> If not click the link.'
>
> ======================================================================
> FAIL: runTest (pgadmin.browser.tests.test_reset_password.ResetPasswordTestCase)
> This function checks reset password functionality. (TestCase for
> Validating Invalid_Email)
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/Users/dpage/git/pgadmin4/web/pgadmin/browser/tests/test_reset_password.py",
> line 44, in runTest
> 'utf-8'))
> AssertionError: 'Recover pgAdmin 4 Password' not found in u'<!DOCTYPE
> HTML PUBLIC "-//W3C//DTD HTML 3.2
> Final//EN">\n<title>Redirecting...</title>\n<h1>Redirecting...</h1>\n<p>You
> should be redirected automatically to target URL: <a href="/">/</a>.
> If not click the link.'
>
> ======================================================================
> FAIL: runTest (pgadmin.browser.tests.test_reset_password.ResetPasswordTestCase)
> This function checks reset password functionality. (TestCase for
> Validating Valid_Email)
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/Users/dpage/git/pgadmin4/web/pgadmin/browser/tests/test_reset_password.py",
> line 44, in runTest
> 'utf-8'))
> AssertionError: 'Recover pgAdmin 4 Password' not found in u'<!DOCTYPE
> HTML PUBLIC "-//W3C//DTD HTML 3.2
> Final//EN">\n<title>Redirecting...</title>\n<h1>Redirecting...</h1>\n<p>You
> should be redirected automatically to target URL: <a href="/">/</a>.
> If not click the link.'
>
> ----------------------------------------------------------------------
> Ran 26 tests in 30.109s
>
> FAILED (failures=3)
>
> It's very far from obvious what's wrong here (/reset looks just fine
> to me). How can we get more useful info out of the framework?
>
> --
> Dave Page
> VP, Chief Architect, Tools & Installers
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
--
Thanks,
Navnath Gadakh
Software Engineer
EnterpriseDB Corporation
Mobile: +91 9975389878
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
Attachments:
[application/octet-stream] pgadmin_unittest_multiple_server.patch (41.0K, 2-pgadmin_unittest_multiple_server.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py
index c0e1430..85dcc6c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py
@@ -8,11 +8,9 @@
# ##################################################################
import json
-import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression import test_utils as utils
-from regression.test_setup import advanced_config_data
class DatabaseAddTestCase(BaseTestGenerator):
@@ -28,14 +26,11 @@ class DatabaseAddTestCase(BaseTestGenerator):
def setUp(self):
"""
- This function perform the two tasks
- 1. Login to test client
- 2. Add the test server
+ This function used to add the sever
:return: None
"""
- utils.login_tester_account(self.tester)
# Add the server
utils.add_server(self.tester)
@@ -45,8 +40,6 @@ class DatabaseAddTestCase(BaseTestGenerator):
server_connect_response, server_group, server_ids = \
utils.connect_server(self.tester)
- # Store db id. Which is use to delete in tearDown()
- self.db_id = ''
for server_connect, server_id in zip(server_connect_response,
server_ids):
if server_connect['data']['connected']:
@@ -58,17 +51,15 @@ class DatabaseAddTestCase(BaseTestGenerator):
self.assertTrue(db_response.status_code, 200)
response_data = json.loads(db_response.data.decode('utf-8'))
utils.write_db_parent_id(response_data)
- self.db_id = response_data['node']['_id']
def tearDown(self):
"""
- This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
+ This function deletes the added database, added server and the
+ 'parent_id.pkl' file which is created in setup()
:return: None
"""
- utils.delete_database(self.tester, self.db_id)
+ utils.delete_database(self.tester)
utils.delete_server(self.tester)
utils.delete_parent_id_file()
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py
index 5f160f9..6830b5a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py
@@ -12,7 +12,7 @@ import json
from pgadmin.utils.route import BaseTestGenerator
from regression import test_utils as utils
from regression.test_setup import config_data
-from regression.test_utils import get_ids, test_getnodes
+from regression.test_utils import get_ids
class DatabaseDeleteTestCase(BaseTestGenerator):
@@ -26,14 +26,12 @@ class DatabaseDeleteTestCase(BaseTestGenerator):
def setUp(self):
"""
This function perform the three tasks
- 1. Login to test client
- 2. Add the test server
- 3. Connect to server
+ 1. Add the test server
+ 2. Connect to server
:return: None
"""
- utils.login_tester_account(self.tester)
# Firstly, add the server
utils.add_server(self.tester)
# Secondly, connect to server/database
@@ -45,14 +43,15 @@ class DatabaseDeleteTestCase(BaseTestGenerator):
srv_grp = config_data['test_server_group']
all_id = get_ids()
server_ids = all_id["sid"]
+ db_ids_dict = all_id["did"][0]
- # TODO: Need to modify the code , to delete the databases for all
- # TODO: servers. Currently it delete only one database.
- db_id = all_id["did"][0]
- db_con = test_getnodes(self.tester)
- if len(db_con) == 0:
- raise Exception("No database(s) to delete!!!")
for server_id in server_ids:
+ db_id = db_ids_dict[int(server_id)]
+ db_con = utils.verify_database(self.tester, srv_grp, server_id,
+ db_id)
+ if len(db_con) == 0:
+ raise Exception("No database(s) to delete for server id %s"
+ % server_id)
response = self.tester.delete(self.url + str(srv_grp) + '/' +
str(server_id) + '/' + str(db_id),
follow_redirects=True)
@@ -62,12 +61,11 @@ class DatabaseDeleteTestCase(BaseTestGenerator):
def tearDown(self):
"""
- This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
+ This function deletes the added server and the 'parent_id.pkl' file
+ which is created in setup() function.
:return: None
"""
utils.delete_server(self.tester)
utils.delete_parent_id_file()
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py
index a42e0c1..7350f72 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py
@@ -10,7 +10,7 @@
from pgadmin.utils.route import BaseTestGenerator
from regression import test_utils as utils
from regression.test_setup import config_data
-from regression.test_utils import get_ids, test_getnodes
+from regression.test_utils import get_ids
class DatabasesGetTestCase(BaseTestGenerator):
@@ -26,14 +26,12 @@ class DatabasesGetTestCase(BaseTestGenerator):
def setUp(self):
"""
This function perform the three tasks
- 1. Login to test client
- 2. Add the test server
- 3. Connect to server
+ 1. Add the test server
+ 2. Connect to server
:return: None
"""
- utils.login_tester_account(self.tester)
# Firstly, add the server
utils.add_server(self.tester)
# Secondly, connect to server/database
@@ -45,28 +43,27 @@ class DatabasesGetTestCase(BaseTestGenerator):
all_id = get_ids()
server_ids = all_id["sid"]
- # TODO: Code is remaining to get all databases of all servers
- self.db_id = all_id["did"][0]
+ db_ids_dict = all_id["did"][0]
srv_grp = config_data['test_server_group']
for server_id in server_ids:
- db_con = test_getnodes(self.tester)
+ db_id = db_ids_dict[int(server_id)]
+ db_con = utils.verify_database(self.tester, srv_grp, server_id,
+ db_id)
if db_con["info"] == "Database connected.":
- response = self.tester.get(self.url + str(srv_grp) + '/' +
- str(server_id) + '/' + str(
- self.db_id),
- follow_redirects=True)
+ response = self.tester.get(
+ self.url + str(srv_grp) + '/' + str(server_id) + '/' +
+ str(db_id), follow_redirects=True)
self.assertEquals(response.status_code, 200)
def tearDown(self):
"""
- This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
+ This function deletes the added database, added server
+ and the 'parent_id.pkl' file which is created in setup() function.
:return: None
"""
- utils.delete_database(self.tester, self.db_id)
+ utils.delete_database(self.tester)
utils.delete_server(self.tester)
utils.delete_parent_id_file()
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py
index c5f92cc..4615d34 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py
@@ -12,7 +12,7 @@ import json
from pgadmin.utils.route import BaseTestGenerator
from regression import test_utils as utils
from regression.test_setup import config_data, advanced_config_data
-from regression.test_utils import get_ids, test_getnodes
+from regression.test_utils import get_ids
class DatabasesUpdateTestCase(BaseTestGenerator):
@@ -28,14 +28,12 @@ class DatabasesUpdateTestCase(BaseTestGenerator):
def setUp(self):
"""
This function perform the three tasks
- 1. Login to test client
- 2. Add the test server
- 3. Connect to server
+ 1. Add the test server
+ 2. Connect to server
:return: None
"""
- utils.login_tester_account(self.tester)
# Firstly, add the server
utils.add_server(self.tester)
# Secondly, connect to server/database
@@ -47,33 +45,30 @@ class DatabasesUpdateTestCase(BaseTestGenerator):
srv_grp = config_data['test_server_group']
all_id = get_ids()
server_ids = all_id["sid"]
-
- # TODO: Need to modify the code , to delete the databases for all
- # TODO: servers. Currently it delete only one database.
- db_id = all_id["did"][0]
- test_getnodes(self.tester)
-
- data = {
- "comments": advanced_config_data["test_db_update_data"][0]
- ["test_comment"],
- "id": db_id
- }
+ db_ids_dict = all_id["did"][0]
for server_id in server_ids:
- put_response = self.tester.put(self.url + str(srv_grp) + '/' +
- str(server_id) + '/' + str(db_id),
- data=json.dumps(data),
- follow_redirects=True)
- self.assertEquals(put_response.status_code, 200)
+ db_id = db_ids_dict[int(server_id)]
+ db_con = utils.verify_database(self.tester, srv_grp, server_id,
+ db_id)
+ if db_con["info"] == "Database connected.":
+ data = {
+ "comments": advanced_config_data["test_db_update_data"][0]
+ ["test_comment"],
+ "id": db_id
+ }
+ put_response = self.tester.put(
+ self.url + str(srv_grp) + '/' + str(server_id) + '/' +
+ str(db_id), data=json.dumps(data), follow_redirects=True)
+ self.assertEquals(put_response.status_code, 200)
def tearDown(self):
"""
- This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
+ This function deletes the added server and 'parent_id.pkl' file
+ which is created in setup() function.
:return: None
"""
utils.delete_server(self.tester)
utils.delete_parent_id_file()
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/server_groups/servers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/tests/__init__.py
index 55a3a17..4fd2066 100644
--- a/web/pgadmin/browser/server_groups/servers/tests/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/tests/__init__.py
@@ -12,4 +12,4 @@ from pgadmin.utils.route import BaseTestGenerator
class ServerGenerateTestCase(BaseTestGenerator):
def runTest(self):
- return
\ No newline at end of file
+ return
diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py
index 0f07d21..2b1eb45 100644
--- a/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py
+++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py
@@ -11,8 +11,6 @@ import json
from pgadmin.utils.route import BaseTestGenerator
from regression import test_utils as utils
-from regression.test_setup import config_data
-from regression.test_utils import get_ids
class ServersAddTestCase(BaseTestGenerator):
@@ -24,12 +22,7 @@ class ServersAddTestCase(BaseTestGenerator):
]
def setUp(self):
- """
- This function login the test account before running the logout
- test case
- """
-
- utils.login_tester_account(self.tester)
+ pass
def runTest(self):
""" This function will add the server under default server group."""
@@ -47,12 +40,11 @@ class ServersAddTestCase(BaseTestGenerator):
def tearDown(self):
"""
- This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
+ This function deletes the added server and the 'parent_id.pkl' file
+ which is created in setup() function.
:return: None
"""
utils.delete_server(self.tester)
utils.delete_parent_id_file()
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py
index 765a371..4fd207b 100644
--- a/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py
+++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py
@@ -25,14 +25,11 @@ class ServerDeleteTestCase(BaseTestGenerator):
def setUp(self):
"""
- This function perform the two tasks
- 1. Login to test client
- 2. Add the test server
+ This function is used to add the server
:return: None
"""
- utils.login_tester_account(self.tester)
# Firstly, add the server
utils.add_server(self.tester)
@@ -58,10 +55,9 @@ class ServerDeleteTestCase(BaseTestGenerator):
def tearDown(self):
"""
This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
+ setup() function.
:return: None
"""
utils.delete_parent_id_file()
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py
index 6ff8e16..ea3c63f 100644
--- a/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py
+++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py
@@ -26,14 +26,11 @@ class ServersGetTestCase(BaseTestGenerator):
def setUp(self):
"""
- This function perform the two tasks
- 1. Login to test client
- 2. Add the test server
+ This function is used to add the server
:return: None
"""
- utils.login_tester_account(self.tester)
utils.add_server(self.tester)
def runTest(self):
@@ -50,12 +47,11 @@ class ServersGetTestCase(BaseTestGenerator):
def tearDown(self):
"""
- This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
+ This function deletes the added server and the 'parent_id.pkl' file
+ which is created in setup() function.
:return: None
"""
utils.delete_server(self.tester)
utils.delete_parent_id_file()
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py
index 659e674..5e810ba 100644
--- a/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py
+++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py
@@ -25,15 +25,13 @@ class ServerUpdateTestCase(BaseTestGenerator):
def setUp(self):
"""
This function perform the four tasks
- 1. Login to test client
- 2. Add the test server
- 3. Get the server
- 4. Connect to server
+ 1. Add the test server
+ 2. Get the server
+ 3. Connect to server
:return: None
"""
- utils.login_tester_account(self.tester)
# Firstly, add the server
utils.add_server(self.tester)
# Get the server
@@ -64,12 +62,11 @@ class ServerUpdateTestCase(BaseTestGenerator):
def tearDown(self):
"""
- This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
+ This function deletes the added server and the 'parent_id.pkl' file
+ which is created in setup() function.
:return: None
"""
utils.delete_server(self.tester)
utils.delete_parent_id_file()
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/server_groups/tests/__init__.py b/web/pgadmin/browser/server_groups/tests/__init__.py
index 7fdd5c7..94218de 100644
--- a/web/pgadmin/browser/server_groups/tests/__init__.py
+++ b/web/pgadmin/browser/server_groups/tests/__init__.py
@@ -12,4 +12,4 @@ from pgadmin.utils.route import BaseTestGenerator
class SGGenerateTestCase(BaseTestGenerator):
def runTest(self):
- return
\ No newline at end of file
+ return
diff --git a/web/pgadmin/browser/server_groups/tests/test_sg_get.py b/web/pgadmin/browser/server_groups/tests/test_sg_get.py
index adcb28a..6c164be 100644
--- a/web/pgadmin/browser/server_groups/tests/test_sg_get.py
+++ b/web/pgadmin/browser/server_groups/tests/test_sg_get.py
@@ -10,7 +10,6 @@
import json
from pgadmin.utils.route import BaseTestGenerator
-from regression import test_utils as utils
from regression.test_setup import config_data
@@ -24,14 +23,6 @@ class SgNodeTestCase(BaseTestGenerator):
('Check Server Group Node', dict(url='/browser/server-group/obj/'))
]
- def setUp(self):
- """
- This function login the test account before running the logout
- test case
- """
-
- utils.login_tester_account(self.tester)
-
def runTest(self):
"""This function will check available server groups."""
@@ -41,8 +32,3 @@ class SgNodeTestCase(BaseTestGenerator):
self.assertTrue(response.status_code, 200)
response_data = json.loads(response.data.decode('utf8'))
self.assertTrue(response_data['id'], server_group_id)
-
- def tearDown(self):
- """This function logout the test account """
-
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/tests/__init__.py b/web/pgadmin/browser/tests/__init__.py
index 3fab6fe..7cce332 100644
--- a/web/pgadmin/browser/tests/__init__.py
+++ b/web/pgadmin/browser/tests/__init__.py
@@ -12,4 +12,4 @@ from pgadmin.utils.route import BaseTestGenerator
class BrowserGenerateTestCase(BaseTestGenerator):
def runTest(self):
- return
\ No newline at end of file
+ return
diff --git a/web/pgadmin/browser/tests/test_change_password.py b/web/pgadmin/browser/tests/test_change_password.py
index 4b77a07..2f714a7 100644
--- a/web/pgadmin/browser/tests/test_change_password.py
+++ b/web/pgadmin/browser/tests/test_change_password.py
@@ -11,7 +11,6 @@ import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.test_setup import config_data
-from regression import test_utils as utils
class ChangePasswordTestCase(BaseTestGenerator):
@@ -80,14 +79,6 @@ class ChangePasswordTestCase(BaseTestGenerator):
]
- def setUp(self):
- """
- This function login the test account before running the logout
- test case
- """
-
- utils.login_tester_account(self.tester)
-
def runTest(self):
"""This function will check change password functionality."""
@@ -104,7 +95,8 @@ class ChangePasswordTestCase(BaseTestGenerator):
email=email, password=password), follow_redirects=True)
response = self.tester.get('/change', follow_redirects=True)
- self.assertIn('pgAdmin 4 Password Change', response.data.decode())
+ self.assertIn('pgAdmin 4 Password Change', response.data.decode(
+ 'utf-8'))
response = self.tester.post('/change', data=dict(
password=self.password,
@@ -112,12 +104,3 @@ class ChangePasswordTestCase(BaseTestGenerator):
new_password_confirm=self.new_password_confirm),
follow_redirects=True)
self.assertIn(self.respdata, response.data.decode('utf-8'))
-
- def tearDown(self):
- """
- This function logout the test client
-
- :return: None
- """
-
- utils.logout_tester_account(self.tester)
diff --git a/web/pgadmin/browser/tests/test_login.py b/web/pgadmin/browser/tests/test_login.py
index 0c8a16d..b0ea361 100644
--- a/web/pgadmin/browser/tests/test_login.py
+++ b/web/pgadmin/browser/tests/test_login.py
@@ -41,7 +41,7 @@ class LoginTestCase(BaseTestGenerator):
respdata='Email not provided')),
# This test case validates empty email and password
- ('Empty_Creadentials', dict(
+ ('Empty_Credentials', dict(
email='', password='',
respdata='Email not provided')),
@@ -53,14 +53,14 @@ class LoginTestCase(BaseTestGenerator):
respdata='Specified user does not exist')),
# This test case validates invalid email and password
- ('Invalid_Creadentials', dict(
+ ('Invalid_Credentials', dict(
email=str(uuid.uuid4())[1:6] + '@xyz.com',
password=str(uuid.uuid4())[4:8],
respdata='Specified user does not exist')),
# This test case validates the valid/correct credentials and allow user
# to login pgAdmin 4
- ('Valid_Creadentials', dict(
+ ('Valid_Credentials', dict(
email=(config_data['pgAdmin4_login_credentials']
['test_login_username']),
password=(config_data['pgAdmin4_login_credentials']
@@ -71,7 +71,12 @@ class LoginTestCase(BaseTestGenerator):
]
def setUp(self):
- pass
+ """
+ We need to logout the test client as we are testing scenarios of
+ logging in the client like invalid password, invalid emails,
+ empty credentials etc.
+ """
+ utils.logout_tester_account(self.tester)
def runTest(self):
"""This function checks login functionality."""
@@ -83,10 +88,7 @@ class LoginTestCase(BaseTestGenerator):
def tearDown(self):
"""
- This function deletes the 'parent_id.pkl' file which is created in
- setup() function. Also this function logout the test client
-
- :return: None
+ We need to again login the test client as soon as test scenarios
+ finishes.
"""
-
- utils.logout_tester_account(self.tester)
+ utils.login_tester_account(self.tester)
diff --git a/web/pgadmin/browser/tests/test_logout.py b/web/pgadmin/browser/tests/test_logout.py
index c2ccf94..729f7b1 100644
--- a/web/pgadmin/browser/tests/test_logout.py
+++ b/web/pgadmin/browser/tests/test_logout.py
@@ -25,15 +25,17 @@ class LogoutTest(BaseTestGenerator):
]
def setUp(self):
- """
- This function login the test account before running the logout
- test case
- """
-
- utils.login_tester_account(self.tester)
+ pass
def runTest(self):
"""This function checks the logout functionality."""
response = self.tester.get('/logout')
self.assertIn(self.respdata, response.data.decode('utf8'))
+
+ def tearDown(self):
+ """
+ We need to again login the test client as soon as test scenarios
+ finishes.
+ """
+ utils.login_tester_account(self.tester)
diff --git a/web/pgadmin/browser/tests/test_reset_password.py b/web/pgadmin/browser/tests/test_reset_password.py
index d0a6fa7..9420c72 100644
--- a/web/pgadmin/browser/tests/test_reset_password.py
+++ b/web/pgadmin/browser/tests/test_reset_password.py
@@ -11,7 +11,7 @@ import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.test_setup import config_data
-from regression import test_utils as utils
+from test_utils import login_tester_account, logout_tester_account
class ResetPasswordTestCase(BaseTestGenerator):
@@ -38,28 +38,18 @@ class ResetPasswordTestCase(BaseTestGenerator):
]
def setUp(self):
- """
- This function login the test account before running the logout
- test case
- """
-
- utils.login_tester_account(self.tester)
+ logout_tester_account(self.tester)
def runTest(self):
"""This function checks reset password functionality."""
response = self.tester.get('/reset')
- self.assertIn('Recover pgAdmin 4 Password', response.data.decode())
+ self.assertIn('Recover pgAdmin 4 Password', response.data.decode(
+ 'utf-8'))
response = self.tester.post(
'/reset', data=dict(email=self.email),
follow_redirects=True)
self.assertIn(self.respdata, response.data.decode('utf-8'))
def tearDown(self):
- """
- This function logout the test client
-
- :return: None
- """
-
- utils.logout_tester_account(self.tester)
+ login_tester_account(self.tester)
diff --git a/web/pgadmin/utils/route.py b/web/pgadmin/utils/route.py
index a2cd1eb..c7ef1f8 100644
--- a/web/pgadmin/utils/route.py
+++ b/web/pgadmin/utils/route.py
@@ -50,12 +50,24 @@ class TestsGeneratorRegistry(ABCMeta):
from importlib import import_module
from werkzeug.utils import find_modules
-
- for module_name in find_modules(pkg, False, True):
- try:
- module = import_module(module_name)
- except ImportError:
- pass
+ import config
+
+ # Check for SERVER mode
+ if config.SERVER_MODE:
+ for module_name in find_modules(pkg, False, True):
+ try:
+ module = import_module(module_name)
+ except ImportError:
+ pass
+ else:
+ for module_name in find_modules(pkg, False, True):
+ try:
+ # Exclude the test cases in browser node if SERVER_MODE
+ # is False
+ if "pgadmin.browser.tests" not in module_name:
+ module = import_module(module_name)
+ except ImportError:
+ pass
import six
diff --git a/web/regression/runtests.py b/web/regression/runtests.py
index 2e3520a..d11a794 100644
--- a/web/regression/runtests.py
+++ b/web/regression/runtests.py
@@ -32,6 +32,7 @@ import config
# Get the config database schema version. We store this in pgadmin.model
# as it turns out that putting it in the config files isn't a great idea
from pgadmin.model import SCHEMA_VERSION
+from test_utils import login_tester_account, logout_tester_account
config.SETTINGS_SCHEMA_VERSION = SCHEMA_VERSION
@@ -43,6 +44,8 @@ config.CONSOLE_LOG_LEVEL = WARNING
app = create_app()
app.config['WTF_CSRF_ENABLED'] = False
test_client = app.test_client()
+# Login the test client
+login_tester_account(test_client)
def get_suite(arguments, test_app_client):
@@ -65,11 +68,11 @@ def get_suite(arguments, test_app_client):
pgadmin_suite = unittest.TestSuite()
# Load the test modules which are in given package(i.e. in arguments.pkg)
- if arguments.pkg is None or arguments.pkg == "all":
+ if arguments['pkg'] is None or arguments['pkg'] == "all":
TestsGeneratorRegistry.load_generators('pgadmin')
else:
TestsGeneratorRegistry.load_generators('pgadmin.{}.tests'.format(
- arguments.pkg))
+ arguments['pkg']))
# Get the each test module and add into list
for key, klass in TestsGeneratorRegistry.registry.items():
@@ -130,7 +133,8 @@ class StreamToLogger(object):
if __name__ == '__main__':
# Set basic logging configuration for log file
logging.basicConfig(level=logging.DEBUG,
- format='%(asctime)s:%(levelname)s:%(name)s:%(message)s',
+ format='%(asctime)s:%(levelname)s:%(name)s:%(message)s'
+ ,
filename=CURRENT_PATH + "/" + "regression.log",
filemode='w'
)
@@ -139,9 +143,12 @@ if __name__ == '__main__':
stderr_logger = logging.getLogger('STDERR')
sys.stderr = StreamToLogger(stderr_logger, logging.ERROR)
- args = add_arguments()
+ args = vars(add_arguments())
suite = get_suite(args, test_client)
tests = unittest.TextTestRunner(stream=sys.stderr, descriptions=True,
verbosity=2).run(suite)
+ # Logout the test client
+ logout_tester_account(test_client)
+
print("Please check output in file: %s/regression.log " % CURRENT_PATH)
diff --git a/web/regression/test_advanced_config.json.in b/web/regression/test_advanced_config.json.in
index bcb867c..c0d278b 100644
--- a/web/regression/test_advanced_config.json.in
+++ b/web/regression/test_advanced_config.json.in
@@ -93,7 +93,101 @@
"test_privileges": [],
"test_securities": [],
"test_variables": []
- }
+ },
+ {
+ "test_privileges_acl": [
+ {
+ "grantee": "enterprisedb",
+ "grantor": "enterprisedb",
+ "privileges": [
+ {
+ "privilege_type": "C",
+ "privilege": true,
+ "with_grant": true
+ },
+ {
+ "privilege_type": "T",
+ "privilege": true,
+ "with_grant": false
+ }
+ ]
+ }
+ ],
+ "test_conn_limit": -1,
+ "test_owner": "enterprisedb",
+ "test_fun_acl": [
+ {
+ "grantee": "enterprisedb",
+ "grantor": "enterprisedb",
+ "privileges": [
+ {
+ "privilege_type": "X",
+ "privilege": true,
+ "with_grant": false
+ }
+ ]
+ }
+ ],
+ "test_seq_acl": [
+ {
+ "grantee": "enterprisedb",
+ "grantor": "enterprisedb",
+ "privileges": [
+ {
+ "privilege_type": "r",
+ "privilege": true,
+ "with_grant": false
+ },
+ {
+ "privilege_type": "w",
+ "privilege": true,
+ "with_grant": false
+ },
+ {
+ "privilege_type": "U",
+ "privilege": true,
+ "with_grant": false
+ }
+ ]
+ }
+ ],
+ "test_tbl_acl": [
+ {
+ "grantee": "enterprisedb",
+ "grantor": "enterprisedb",
+ "privileges": [
+ {
+ "privilege_type": "a",
+ "privilege": true,
+ "with_grant": true
+ },
+ {
+ "privilege_type": "r",
+ "privilege": true,
+ "with_grant": false
+ }
+ ]
+ }
+ ],
+ "test_type_acl": [
+ {
+ "grantee": "enterprisedb",
+ "grantor": "enterprisedb",
+ "privileges": [
+ {
+ "privilege_type": "U",
+ "privilege": true,
+ "with_grant": false
+ }
+ ]
+ }
+ ],
+ "test_encoding": "UTF8",
+ "test_name": "test_db_automation",
+ "test_privileges": [],
+ "test_securities": [],
+ "test_variables": []
+ }
],
"test_db_update_data": [
diff --git a/web/regression/test_config.json.in b/web/regression/test_config.json.in
index d81d179..028d1e7 100644
--- a/web/regression/test_config.json.in
+++ b/web/regression/test_config.json.in
@@ -15,7 +15,17 @@
"test_db_port": 5432,
"test_maintenance_db": "postgres",
"test_sslmode": "prefer"
- }
+ },
+ {
+ "test_name": "Postgres Plus Advanced Server 9.4",
+ "test_comment": "Postgres Plus Advanced 9.4 Server (EDB Installer)",
+ "test_db_username": "enterprisedb",
+ "test_host": "localhost",
+ "test_db_password": "edb",
+ "test_db_port": 5444,
+ "test_maintenance_db": "edb",
+ "test_sslmode": "prefer"
+ }
],
"test_server_update_data": [
{
diff --git a/web/regression/test_utils.py b/web/regression/test_utils.py
index 0bcc10f..6be2bb2 100644
--- a/web/regression/test_utils.py
+++ b/web/regression/test_utils.py
@@ -12,11 +12,13 @@ import pickle
import json
import uuid
-from test_setup import config_data, advanced_config_data, pickle_path
+from test_setup import config_data, advanced_config_data, \
+ pickle_path
SERVER_URL = '/browser/server/obj/'
SERVER_CONNECT_URL = 'browser/server/connect/'
-DATABASE_CONNECT_URL = '/browser/database/obj/'
+DATABASE_URL = '/browser/database/obj/'
+DATABASE_CONNECT_URL = 'browser/database/connect/'
def get_ids(url=pickle_path):
@@ -36,6 +38,39 @@ def get_ids(url=pickle_path):
return ids
+def verify_database(tester, server_group, server_id, db_id):
+ """
+ This function verifies that database is exists and whether it connect
+ successfully or not
+
+ :param tester: test client
+ :type tester: flask test client object
+ :param server_group: server group id
+ :type server_group: int
+ :param server_id: server id
+ :type server_id: str
+ :param db_id: database id
+ :type db_id: str
+ :return: temp_db_con
+ :rtype: list
+ """
+
+ # Connect to server
+ response = tester.post('{0}{1}/{2}'.format(
+ SERVER_CONNECT_URL, server_group, server_id), data=dict(
+ password=config_data['test_server_credentials'][0][
+ 'test_db_password']),
+ follow_redirects=True)
+
+ # Connect to database
+ con_response = tester.post('{0}{1}/{2}/{3}'.format(
+ DATABASE_CONNECT_URL, server_group, server_id, db_id),
+ follow_redirects=True)
+ temp_db_con = json.loads(con_response.data.decode('utf-8'))
+
+ return temp_db_con
+
+
def test_getnodes(tester=None):
# Connect to server and database.
@@ -45,24 +80,13 @@ def test_getnodes(tester=None):
all_id = get_ids()
server_ids = all_id["sid"]
- db_id = all_id["did"][0]
+ db_ids_dict = all_id["did"][0]
srv_grp = config_data['test_server_group']
- # TODO: need to add code to handle multiple databases with servers
+ db_con = []
for server_id in server_ids:
- # Connect to server
- response = tester.post('browser/server/connect/{0}/{1}'.format(
- srv_grp, server_id), data=dict(
- password=config_data['test_server_credentials'][0][
- 'test_db_password']),
- follow_redirects=True)
-
- # Connect to database
- con_response = tester.post(
- 'browser/database/connect/{0}/{1}/{2}'.format(
- srv_grp, server_id, db_id), follow_redirects=True)
- db_con = json.loads(con_response.data.decode('utf-8'))
-
+ db_id = db_ids_dict[int(server_id)]
+ db_con.append(verify_database(tester, srv_grp, server_id, db_id))
return db_con
@@ -76,31 +100,30 @@ def get_db_data(server_connect_data):
:rtype: dict
"""
+ adv_config_data = None
+ data = None
db_user = server_connect_data['data']['user']['name']
- if db_user == "postgres":
- # Get the advance test data of 'postgres' user
- adv_config_data = advanced_config_data[
- 'test_add_database_data'][0]
- else:
- # Get the advance test data of 'enterprisedb' user
- adv_config_data = advanced_config_data[
- 'test_add_database_data'][1]
-
- data = {
- "datacl": adv_config_data['test_privileges_acl'],
- "datconnlimit": adv_config_data['test_conn_limit'],
- "datowner": adv_config_data['test_owner'],
- "deffuncacl": adv_config_data['test_fun_acl'],
- "defseqacl": adv_config_data['test_seq_acl'],
- "deftblacl": adv_config_data['test_tbl_acl'],
- "deftypeacl": adv_config_data['test_type_acl'],
- "encoding": adv_config_data['test_encoding'],
- "name": str(uuid.uuid4())[1:8],
- "privileges": adv_config_data['test_privileges'],
- "securities": adv_config_data['test_securities'],
- "variables": adv_config_data['test_variables']
- }
+ # Get the config data of appropriate db user
+ for config_test_data in advanced_config_data['test_add_database_data']:
+ if db_user == config_test_data['test_owner']:
+ adv_config_data = config_test_data
+
+ if adv_config_data is not None:
+ data = {
+ "datacl": adv_config_data['test_privileges_acl'],
+ "datconnlimit": adv_config_data['test_conn_limit'],
+ "datowner": adv_config_data['test_owner'],
+ "deffuncacl": adv_config_data['test_fun_acl'],
+ "defseqacl": adv_config_data['test_seq_acl'],
+ "deftblacl": adv_config_data['test_tbl_acl'],
+ "deftypeacl": adv_config_data['test_type_acl'],
+ "encoding": adv_config_data['test_encoding'],
+ "name": str(uuid.uuid4())[1:8],
+ "privileges": adv_config_data['test_privileges'],
+ "securities": adv_config_data['test_securities'],
+ "variables": adv_config_data['test_variables']
+ }
return data
@@ -199,13 +222,18 @@ def write_db_parent_id(response_data):
"""
db_id = response_data['node']['_id']
+ server_id = response_data['node']['_pid']
if os.path.isfile(pickle_path):
existing_server_id = open(pickle_path, 'rb')
tol_server_id = pickle.load(existing_server_id)
pickle_id_dict = tol_server_id
-
- pickle_id_dict["did"].append(db_id)
-
+ if 'did' in pickle_id_dict:
+ if pickle_id_dict['did']:
+ # Add the db_id as value in dict
+ pickle_id_dict["did"][0].update({server_id: db_id})
+ else:
+ # Create new dict with server_id and db_id
+ pickle_id_dict["did"].append({server_id: db_id})
db_output = open(pickle_path, 'wb')
pickle.dump(pickle_id_dict, db_output)
db_output.close()
@@ -288,7 +316,8 @@ def connect_server(tester):
['test_db_password']),
follow_redirects=True)
server_connect_detail = json.loads(response.data.decode())
- connect_database(tester, server_connect_detail, server_id, server_group)
+ connect_database(tester, server_connect_detail, server_id,
+ server_group)
server_connect.append(server_connect_detail)
servers.append(server_id)
return server_connect, server_group, servers
@@ -313,7 +342,7 @@ def connect_database(tester, server_connect, server_id, server_group):
if server_connect['data']['connected']:
db_data = get_db_data(server_connect)
db_response = tester.post(
- DATABASE_CONNECT_URL + str(server_group) + "/" + server_id + "/",
+ DATABASE_URL + str(server_group) + "/" + server_id + "/",
data=json.dumps(db_data),
content_type='html/json')
response_data = json.loads(db_response.data.decode())
@@ -341,31 +370,28 @@ def delete_server(tester):
assert response_data['success'] == 1
-def delete_database(tester, db_id):
+def delete_database(tester):
"""
This function used to delete the added databases
:param tester: test client object
- :param db_id: database id to be delete
- :type db_id: int
:return: None
"""
srv_grp = config_data['test_server_group']
all_id = get_ids()
server_ids = all_id["sid"]
-
- # TODO: Need to modify the code , to delete the databases for all
- # TODO: servers. Currently it delete only one database.
- #db_id = all_id["did"][0]
+ db_ids_dict = all_id['did'][0]
db_con = test_getnodes(tester)
if len(db_con) == 0:
raise Exception("No database(s) to delete.")
for server_id in server_ids:
- response = tester.delete(DATABASE_CONNECT_URL + str(srv_grp) + '/' + str(
- server_id) + '/' + str(db_id), follow_redirects=True)
+ db_id = db_ids_dict[int(server_id)]
+ response = tester.delete(DATABASE_URL + str(srv_grp) + '/' +
+ str(server_id) + '/' + str(db_id),
+ follow_redirects=True)
assert response.status_code == 200
response_data = json.loads(response.data.decode('utf-8'))
assert response_data['success'] == 1
view thread (29+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected], [email protected]
Subject: Re: pgAdmin IV : Unittest modular patch
In-Reply-To: <CAOAJCYpcye6nQAPB8os9vZXOhAf9wEvr6rA9i4vuZLDVrRYF0g@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox