Major update to the test suite:

1. Code changes (due to drop objects functionality).
2. Quoting for database names in drop databases.
3. Code changes for import errors for pickle_path and advanced_config variables.
This commit is contained in:
Navnath Gadakh
2016-10-07 13:59:43 +01:00
committed by Dave Page
parent 50658808d9
commit ae612f5403
89 changed files with 3683 additions and 4731 deletions

View File

@@ -6,14 +6,13 @@
# #This software is released under the PostgreSQL Licence
#
# ##########################################################################
import uuid
import json
from pgadmin.utils.route import BaseTestGenerator
from regression.test_setup import config_data
from regression import test_utils as utils
from utils import change_password
from regression import test_utils
from . import utils
class ChangePasswordTestCase(BaseTestGenerator):
@@ -89,30 +88,25 @@ class ChangePasswordTestCase(BaseTestGenerator):
confirmPassword=self.password, active=1, role="2"),
follow_redirects=True)
user_id = json.loads(response.data.decode('utf-8'))['id']
# Logout the Administrator before login normal user
utils.logout_tester_account(self.tester)
test_utils.logout_tester_account(self.tester)
response = self.tester.post('/login', data=dict(
email=self.username, password=self.password),
follow_redirects=True)
assert response.status_code == 200
self.assertEquals(response.status_code, 200)
# test the 'change password' test case
change_password(self)
utils.change_password(self)
# Delete the normal user after changing it's password
utils.logout_tester_account(self.tester)
test_utils.logout_tester_account(self.tester)
# Login the Administrator before deleting normal user
utils.login_tester_account(self.tester)
test_utils.login_tester_account(self.tester)
response = self.tester.delete(
'/user_management/user/' + str(user_id),
follow_redirects=True)
assert response.status_code == 200
self.assertEquals(response.status_code, 200)
else:
change_password(self)
utils.change_password(self)
@classmethod
def tearDownClass(cls):
utils.login_tester_account(cls.tester)
test_utils.login_tester_account(cls.tester)

View File

@@ -85,7 +85,7 @@ class LoginTestCase(BaseTestGenerator):
response = self.tester.post('/login', data=dict(
email=self.email, password=self.password),
follow_redirects=True)
self.assertIn(self.respdata, response.data.decode('utf8'))
self.assertTrue(self.respdata in response.data.decode('utf8'))
@classmethod
def tearDownClass(cls):

View File

@@ -32,7 +32,7 @@ class LogoutTest(BaseTestGenerator):
"""This function checks the logout functionality."""
response = self.tester.get('/logout')
self.assertIn(self.respdata, response.data.decode('utf8'))
self.assertTrue(self.respdata in response.data.decode('utf8'))
@classmethod
def tearDownClass(cls):

View File

@@ -6,12 +6,12 @@
# #This software is released under the PostgreSQL Licence
#
# ##########################################################################
import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.test_setup import config_data
from test_utils import login_tester_account, logout_tester_account
from regression.test_utils import login_tester_account
from regression.test_utils import logout_tester_account
class ResetPasswordTestCase(BaseTestGenerator):
@@ -45,12 +45,12 @@ class ResetPasswordTestCase(BaseTestGenerator):
"""This function checks reset password functionality."""
response = self.tester.get('/reset')
self.assertIn('Recover pgAdmin 4 Password', response.data.decode(
self.assertTrue('Recover pgAdmin 4 Password' in 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'))
self.assertTrue(self.respdata in response.data.decode('utf-8'))
@classmethod
def tearDownClass(cls):

View File

@@ -10,7 +10,7 @@
def change_password(self):
response = self.tester.get('/change', follow_redirects=True)
self.assertIn('pgAdmin 4 Password Change', response.data.decode(
self.assertTrue('pgAdmin 4 Password Change' in response.data.decode(
'utf-8'))
response = self.tester.post('/change', data=dict(
@@ -18,4 +18,4 @@ def change_password(self):
new_password=self.new_password,
new_password_confirm=self.new_password_confirm),
follow_redirects=True)
self.assertIn(self.respdata, response.data.decode('utf-8'))
self.assertTrue(self.respdata in response.data.decode('utf-8'))