summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Mancy <rmancy@redhat.com>2011-10-17 10:48:36 +1000
committerRaymond Mancy <rmancy@redhat.com>2011-10-18 17:27:09 +1000
commitd0a99c12b68091e72097dc31bda537d85ca76686 (patch)
treefc913627df26fa89658fed988fdcb2a68b8d2e7b
parent6cce2af643677e74c2125df020d48c703e2ffd32 (diff)
Requires beaker-labcontroller by integration-tests to enable testing lab controller code on the serverbeaker-distribution-beaker-dogfood-1_1-28
-rw-r--r--IntegrationTests/setup.py.in2
-rw-r--r--IntegrationTests/src/bkr/inttest/labcontroller/test_logs.py4
-rw-r--r--LabController/proxy/labcontroller.conf15
-rw-r--r--Tasks/distribution/beaker/dogfood/Makefile1
-rw-r--r--beaker.spec1
5 files changed, 14 insertions, 9 deletions
diff --git a/IntegrationTests/setup.py.in b/IntegrationTests/setup.py.in
index 5d11c3c..50534d1 100644
--- a/IntegrationTests/setup.py.in
+++ b/IntegrationTests/setup.py.in
@@ -6,7 +6,7 @@ setup(
packages=find_packages('src'),
package_dir={'': 'src'},
package_data={'': [
- '*.xml',
+ '*.xml',
'server/motd.xml',
'server/selenium/*.rpm',
'server/selenium/invalid-task_file',
diff --git a/IntegrationTests/src/bkr/inttest/labcontroller/test_logs.py b/IntegrationTests/src/bkr/inttest/labcontroller/test_logs.py
index a35b1fb..5c97430 100644
--- a/IntegrationTests/src/bkr/inttest/labcontroller/test_logs.py
+++ b/IntegrationTests/src/bkr/inttest/labcontroller/test_logs.py
@@ -10,6 +10,8 @@ from bkr.inttest.data_setup import unique_name
# This number (300) has been tested to work with
# 1024 and 2 as the maxbytes and backupcount
_log_print_count = 300
+_log_maxbytes = 1024
+_log_backupcount = 2
class TestLogs(unittest.TestCase):
@@ -28,6 +30,8 @@ class TestLogs(unittest.TestCase):
self.logger.handlers[:] = []
def test_log_size(self):
+ self.conf['LOG_MAXBYTES'] = _log_maxbytes
+ self.conf['LOG_BACKUPCOUNT'] = _log_backupcount
test_string = 'testingsize'
for i in range(_log_print_count):
self.logger.debug(test_string)
diff --git a/LabController/proxy/labcontroller.conf b/LabController/proxy/labcontroller.conf
index 852c89b..41537ab 100644
--- a/LabController/proxy/labcontroller.conf
+++ b/LabController/proxy/labcontroller.conf
@@ -36,20 +36,19 @@ RSYNC_FLAGS = "-ar --password-file /root/rsync-secret.txt"
QPID_BUS=False
# services that you wish to use qpid (only used if QPID_BUS is True)
-#QPID_LISTEN_TO = ['beaker.watchdog']
+QPID_LISTEN_TO = ['beaker.watchdog']
# The hostname of the qpid broker
-#QPID_BROKER = 'localhost'
+QPID_BROKER = 'localhost'
# The queue on which the watchdog can send rpc like calls
-#QPID_SERVICE_QUEUE = 'service-queue'
-
-#QPID_TOPIC_EXCHANGE = 'amqp.topic'
-#QPID_HEADERS_EXCHANGE = 'amqp.headers'
+QPID_SERVICE_QUEUE = 'service-queue'
+QPID_TOPIC_EXCHANGE = 'amqp.topic'
+QPID_HEADERS_EXCHANGE = 'amqp.headers'
# Set to True if the qpid broker requires krb authentication
-#QPID_KRB_AUTH = False
+QPID_KRB_AUTH = False
#Here are some default values for the rotating log handler
-LOG_MAXBYTES = 10*(1024**2)
+LOG_MAXBYTES = 10485760
LOG_BACKUPCOUNT = 5
diff --git a/Tasks/distribution/beaker/dogfood/Makefile b/Tasks/distribution/beaker/dogfood/Makefile
index c16db84..c25f36b 100644
--- a/Tasks/distribution/beaker/dogfood/Makefile
+++ b/Tasks/distribution/beaker/dogfood/Makefile
@@ -74,6 +74,7 @@ $(METADATA): Makefile
@echo "Environment: BEAKER_SERVER_BASE_URL=http://localhost/bkr/" >> $(METADATA)
# @echo "Environment: BEAKER_SKIP_INIT_DB=1" >> $(METADATA)
@echo "Environment: BEAKER_CONFIG_FILE=/etc/beaker/server.cfg" >> $(METADATA)
+ @echo "Environment: BEAKER_LABCONTROLLER_CONFIG_FILE=/etc/beaker/labcontroller.cfg" >> $(METADATA)
@echo "Environment: BEAKER_CLIENT_COMMAND=bkr" >> $(METADATA)
@echo "Environment: NOSEARGS=bkr" >> $(METADATA)
diff --git a/beaker.spec b/beaker.spec
index 4114762..75a6dd8 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -103,6 +103,7 @@ Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
Requires: %{name}-server = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-labcontroller = %{version}-%{release}
Requires: python-nose >= 0.10
Requires: python-selenium >= 2.0
Requires: kobo