diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2008-09-04 15:00:03 +0100 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2008-09-04 15:00:03 +0100 |
| commit | 45e60556aa523bddd6144eeadb6387c5705bd1f6 (patch) | |
| tree | e72b6369235ec028ce4492703b2c4878d78bfb53 | |
| parent | 6926865c7c5ca7dac6be8a78ece469add7b14b92 (diff) | |
| download | rabbitmq-server-45e60556aa523bddd6144eeadb6387c5705bd1f6.tar.gz | |
Added tests to cover the changes made in last commit
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 7 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 12 |
3 files changed, 17 insertions, 10 deletions
@@ -99,11 +99,11 @@ generic_stage: if [ -f INSTALL.in ]; then \ cp INSTALL.in $(GENERIC_STAGE_DIR)/INSTALL; \ - elinks -dump -no-references -no-numbering $(WEB_URL)install.html \ - >> $(GENERIC_STAGE_DIR)/INSTALL; \ +# elinks -dump -no-references -no-numbering $(WEB_URL)install.html \ +# >> $(GENERIC_STAGE_DIR)/INSTALL; \ cp BUILD.in $(GENERIC_STAGE_DIR)/BUILD; \ - elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \ - >> $(GENERIC_STAGE_DIR)/BUILD; \ +# elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \ +# >> $(GENERIC_STAGE_DIR)/BUILD; \ else \ cp INSTALL $(GENERIC_STAGE_DIR); \ cp BUILD $(GENERIC_STAGE_DIR); \ diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index aeb958a7..5e4812a3 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -18,10 +18,11 @@ package: clean make -C ../.. check_tools tar -zxvf $(TARBALL_DIR)/$(TARBALL) cp -r debian $(UNPACKED_DIR) - chmod -R a+x $(UNPACKED_DIR)/debian + chmod a+x $(UNPACKED_DIR)/debian/rules + cp /home/hubert/work/tmp/rabbitmq-server-1.4.0.tar.gz $(UNPACKED_DIR)/rabbitmq-server-1.4.0.orig.tar.gz UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) - cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) - rm -rf $(UNPACKED_DIR) +# cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) +# rm -rf $(UNPACKED_DIR) clean: rm -rf $(UNPACKED_DIR) diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 64425ee7..fff02d73 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -209,7 +209,7 @@ test_log_management() -> ok = application:set_env(sasl, sasl_error_logger, false), ok = application:set_env(kernel, error_logger, silent), ok = control_action(rotate_logs, []), - [{error, enoent}, {error, enoent}] = empty_files([MainLog, SaslLog]), + [{error, enoent}, {error, enoent}] = empty_files([MainLog, SaslLog]), %% cleanup ok = application:set_env(sasl, sasl_error_logger, {file, SaslLog}), @@ -256,10 +256,16 @@ test_log_management_during_startup() -> {error, {cannot_log_to_file, _, _}} -> ok end, - %% cleanup - ok = add_log_handlers([{error_logger_file_h, MainLog}]), + %% start application with standard error_logger_file_h + %% handler not installed ok = application:set_env(kernel, error_logger, {file, MainLog}), ok = control_action(start_app, []), + ok = control_action(stop_app, []), + + %% start application with standard sasl handler not installed + %% and rabbit main log handler installed correctly + ok = delete_log_handlers([rabbit_sasl_report_file_h]), + ok = control_action(start_app, []), passed. test_cluster_management() -> |