From 5b7758ff55965f14f0585308c62c411123e4e345 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Wed, 18 Jun 2014 14:05:46 -0500
Subject: [PATCH] Replace methods and vars named test_lwr_server.
... with pulsar counterparts.
---
test/integration_test.py | 4 ++--
test/lwr_objectstore_test.py | 4 ++--
test/test_utils.py | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/integration_test.py b/test/integration_test.py
index 03f9b819..0d7d6269 100644
--- a/test/integration_test.py
+++ b/test/integration_test.py
@@ -5,7 +5,7 @@ from six.moves import configparser
from .test_utils import TempDirectoryTestCase, skipUnlessExecutable, skipUnlessModule
from .test_utils import test_pulsar_app
-from .test_utils import test_lwr_server
+from .test_utils import test_pulsar_server
from .test_utils import files_server
from galaxy.util.bunch import Bunch
@@ -39,7 +39,7 @@ class BaseIntegrationTest(TempDirectoryTestCase):
self._run_in_test_server(app_conf, **kwds)
def _run_in_test_server(self, app_conf, **kwds):
- with test_lwr_server(app_conf=app_conf) as server:
+ with test_pulsar_server(app_conf=app_conf) as server:
options = Bunch(url=server.application_url, **kwds)
self._update_options_for_app(options, server.test_app.application, **kwds)
run(options)
diff --git a/test/lwr_objectstore_test.py b/test/lwr_objectstore_test.py
index a4c85d97..d541e291 100644
--- a/test/lwr_objectstore_test.py
+++ b/test/lwr_objectstore_test.py
@@ -36,8 +36,8 @@ class LwrObjectStoreTest(TempDirectoryTestCase):
object_store_config_file=object_store_config_file,
private_key="12345",
)
- from .test_utils import test_lwr_server
- with test_lwr_server(app_conf=app_conf) as server:
+ from .test_utils import test_pulsar_server
+ with test_pulsar_server(app_conf=app_conf) as server:
url = server.application_url
# Define a proxy LWR object store.
proxy_object_store_config_file = join(self.temp_directory, "proxy_object_store_conf.xml")
diff --git a/test/test_utils.py b/test/test_utils.py
index ec9de7ce..f7494e74 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -136,10 +136,10 @@ def server_for_test_app(app):
@nottest
@contextmanager
-def test_lwr_server(global_conf={}, app_conf={}, test_conf={}):
+def test_pulsar_server(global_conf={}, app_conf={}, test_conf={}):
with test_pulsar_app(global_conf, app_conf, test_conf) as app:
- with server_for_test_app(app) as test_lwr_server:
- yield test_lwr_server
+ with server_for_test_app(app) as test_pulsar_server:
+ yield test_pulsar_server
@nottest
--
GitLab