From 426794775789cbdd85c4e178d2b27c36e6d89568 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Nov 16 2017 14:35:09 +0000 Subject: Fix test failures on armv7hl Signed-off-by: Peter Lemenkov --- diff --git a/couchdb-0018-Revert-disable-tests-failing-on-ARM.patch b/couchdb-0018-Revert-disable-tests-failing-on-ARM.patch new file mode 100644 index 0000000..d1b32cc --- /dev/null +++ b/couchdb-0018-Revert-disable-tests-failing-on-ARM.patch @@ -0,0 +1,32 @@ +From: Peter Lemenkov +Date: Thu, 16 Nov 2017 17:04:47 +0300 +Subject: [PATCH] Revert "disable tests failing on ARM" + +This reverts commit 371a2bc448682ad490b80a2784afe2ed5c29ba07. + +diff --git a/test/couchdb/couch_stats_tests.erl b/test/couchdb/couch_stats_tests.erl +index d74cc3d61..8810ae990 100644 +--- a/test/couchdb/couch_stats_tests.erl ++++ b/test/couchdb/couch_stats_tests.erl +@@ -74,6 +74,7 @@ couch_stats_collector_test_() -> + should_clear_absolute_values(), + should_track_process_count(), + should_increment_counter_multiple_times_per_pid(), ++ should_decrement_counter_on_process_exit(), + should_decrement_for_each_track_process_count_call_on_exit(), + should_return_all_counters_and_absolute_values(), + should_return_incremental_counters(), +diff --git a/test/couchdb/couchdb_attachments_tests.erl b/test/couchdb/couchdb_attachments_tests.erl +index 2f2cf5636..022a170ad 100644 +--- a/test/couchdb/couchdb_attachments_tests.erl ++++ b/test/couchdb/couchdb_attachments_tests.erl +@@ -151,7 +151,8 @@ attachments_compression_tests() -> + fun setup/0, fun teardown/1, + [ + fun should_not_create_compressed_att_with_deflate_encoding/1, +- fun should_not_create_compressed_att_with_compress_encoding/1 ++ fun should_not_create_compressed_att_with_compress_encoding/1, ++ fun should_create_compressible_att_with_ctype_params/1 + ] + } + ] diff --git a/couchdb-0019-Increase-various-eunit-test-timeouts.patch b/couchdb-0019-Increase-various-eunit-test-timeouts.patch new file mode 100644 index 0000000..211fb0a --- /dev/null +++ b/couchdb-0019-Increase-various-eunit-test-timeouts.patch @@ -0,0 +1,21 @@ +From: Jay Doane +Date: Wed, 26 Jul 2017 11:15:12 -0700 +Subject: [PATCH] Increase various eunit test timeouts + +Several eunit tests tend to fail by timing out when run on +travis-ci. This change increases timeouts on the more commonly failing +tests, and improves test robustness. + +diff --git a/test/couchdb/couch_changes_tests.erl b/test/couchdb/couch_changes_tests.erl +index a129ba2fd..d7519a769 100644 +--- a/test/couchdb/couch_changes_tests.erl ++++ b/test/couchdb/couch_changes_tests.erl +@@ -16,7 +16,7 @@ + -include_lib("couchdb/couch_db.hrl"). + + -define(ADMIN_USER, {user_ctx, #user_ctx{roles = [<<"_admin">>]}}). +--define(TIMEOUT, 3000). ++-define(TIMEOUT, 6000). + -define(TEST_TIMEOUT, 10000). + + -record(row, { diff --git a/couchdb.spec b/couchdb.spec index 009d0a6..197af5d 100644 --- a/couchdb.spec +++ b/couchdb.spec @@ -1,6 +1,6 @@ Name: couchdb Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A document database server, accessible via a RESTful JSON API Group: Applications/Databases @@ -28,6 +28,8 @@ Patch14: couchdb-0014-Switch-JSON-encoding-decoding-to-Jiffy.patch Patch15: couchdb-0015-Fix-tests-for-Jiffy.patch Patch16: couchdb-0016-disable-tests-failing-on-ARM.patch Patch17: couchdb-0017-Update-jiffy-to-use-dedupe_keys.patch +Patch18: couchdb-0018-Revert-disable-tests-failing-on-ARM.patch +Patch19: couchdb-0019-Increase-various-eunit-test-timeouts.patch BuildRequires: autoconf BuildRequires: autoconf-archive BuildRequires: automake @@ -164,6 +166,9 @@ exit 0 %changelog +* Thu Nov 16 2017 Peter Lemenkov - 1.7.1-2 +- Fix test failures on armv7hl + * Wed Nov 15 2017 Peter Lemenkov - 1.7.1-1 - Ver. 1.7.1 (last-minute fix release)