[couchdb] branch more-smoosh-test-flaky-test-fixups created (now a74a11b0b)

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a change to branch more-smoosh-test-flaky-test-fixups
in repository https://gitbox.apache.org/repos/asf/couchdb.git


      at a74a11b0b A few more smoosh test flaky fixups

This branch includes the following new commits:

     new a74a11b0b A few more smoosh test flaky fixups

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] 01/01: A few more smoosh test flaky fixups

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch more-smoosh-test-flaky-test-fixups
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit a74a11b0b0324f84957106cb36c490045f51b14b
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Tue Dec 6 15:55:17 2022 -0500

    A few more smoosh test flaky fixups
    
    Should help with the failures in
    
    ```
    smoosh_tests:21: smoosh_test_ (t_index_cleanup_happens_by_default)...[0.117 s] ok
    smoosh_tests:22: smoosh_test_ (t_index_cleanup_can_be_disabled)...*failed*
     in function meck_proc:wait/6 (src/meck_proc.erl, line 171)
     in call from smoosh_tests:t_index_cleanup_can_be_disabled/1 (test/smoosh_tests.erl, line 167)
     in call from eunit_test:run_testfun/1 (eunit_test.erl, line 71)
     in call from eunit_proc:run_test/1 (eunit_proc.erl, line 531)
     in call from eunit_proc:with_timeout/3 (eunit_proc.erl, line 356)
     in call from eunit_proc:handle_test/2 (eunit_proc.erl, line 514)
     in call from eunit_proc:tests_inorder/3 (eunit_proc.erl, line 456)
     in call from eunit_proc:with_timeout/3 (eunit_proc.erl, line 346)
    **error:timeout
      output:<<"">>
    ```
    
    Looking at runtimes there it seems our CI in Jenkins is faster than my laptop
    so it's exposing some race condition we don't see locally.
---
 src/smoosh/test/smoosh_tests.erl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/smoosh/test/smoosh_tests.erl b/src/smoosh/test/smoosh_tests.erl
index cf8c9dc2e..7133adaba 100644
--- a/src/smoosh/test/smoosh_tests.erl
+++ b/src/smoosh/test/smoosh_tests.erl
@@ -123,8 +123,7 @@ t_db_is_enqueued_and_compacted(DbName) ->
     meck:reset(smoosh_channel),
     {ok, _} = delete_doc(DbName, <<"doc1">>),
     ok = wait_to_enqueue(DbName),
-    ok = wait_compact_start(),
-    ok = wait_normal_down().
+    ok = wait_compact_start().
 
 t_view_is_enqueued_and_compacted(DbName) ->
     % We don't want index cleanup to interfere for now
@@ -137,8 +136,7 @@ t_view_is_enqueued_and_compacted(DbName) ->
     meck:reset(smoosh_channel),
     {ok, _} = fabric:query_view(DbName, <<"foo">>, <<"bar">>),
     ok = wait_to_enqueue({DbName, <<"_design/foo">>}),
-    ok = wait_compact_start(),
-    ok = wait_normal_down().
+    ok = wait_compact_start().
 
 t_index_cleanup_happens_by_default(DbName) ->
     ?assert(config:get_boolean("smoosh", "cleanup_index_files", true)),
@@ -164,7 +162,6 @@ t_index_cleanup_can_be_disabled(DbName) ->
     meck:reset(smoosh_channel),
     {ok, _} = fabric:query_view(DbName, <<"foo">>, <<"bar">>),
     ok = wait_compact_start(),
-    ok = wait_normal_down(),
     % View cleanup was not called
     timer:sleep(1000),
     ?assertEqual(0, meck:num_calls(fabric, cleanup_index_files, 1)).