From 4acecfa59a650369f14e1f61db8816e4eb13718a Mon Sep 17 00:00:00 2001 From: Sarah McAlear Date: Tue, 2 May 2017 12:00:30 +0100 Subject: [PATCH] Use a different server name for unit vs. feature tests to avoid some observed conflicts. --- web/regression/feature_utils/base_feature_test.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/regression/feature_utils/base_feature_test.py b/web/regression/feature_utils/base_feature_test.py index dc704e8e8..899542902 100644 --- a/web/regression/feature_utils/base_feature_test.py +++ b/web/regression/feature_utils/base_feature_test.py @@ -13,6 +13,8 @@ import os from datetime import datetime +from copy import deepcopy + import config as app_config from pgadmin.utils.route import BaseTestGenerator from regression.feature_utils.pgadmin_page import PgadminPage @@ -22,6 +24,8 @@ class BaseFeatureTest(BaseTestGenerator): CURRENT_PATH = os.path.dirname(os.path.realpath(__file__)) def setUp(self): + self.server = deepcopy(self.server) + self.server['name'] += ' Feature Tests' if app_config.SERVER_MODE: self.skipTest("Currently, config is set to start pgadmin in server mode. " "This test doesn't know username and password so doesn't work in server mode")