You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2019/02/21 10:51:04 UTC

[couchdb] branch jenkins-fix-elixir-take-2 updated: fix more tests

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

garren pushed a commit to branch jenkins-fix-elixir-take-2
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/jenkins-fix-elixir-take-2 by this push:
     new cef930a  fix more tests
cef930a is described below

commit cef930aaa155085b9f971d66dfff684ec622a235
Author: Garren Smith <ga...@gmail.com>
AuthorDate: Thu Feb 21 12:50:46 2019 +0200

    fix more tests
---
 test/elixir/test/bulk_docs_test.exs      |  1 +
 test/elixir/test/test_helper.exs         |  2 +-
 test/elixir/test/view_collation_test.exs | 10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/elixir/test/bulk_docs_test.exs b/test/elixir/test/bulk_docs_test.exs
index 4fb90b2..dd92025 100644
--- a/test/elixir/test/bulk_docs_test.exs
+++ b/test/elixir/test/bulk_docs_test.exs
@@ -44,6 +44,7 @@ defmodule BulkDocsTest do
   end
 
   @tag :with_db
+  @tag :skip_on_jenkins
   test "bulk docs can detect conflicts", ctx do
     db = ctx[:db_name]
     docs = create_docs(@doc_range)
diff --git a/test/elixir/test/test_helper.exs b/test/elixir/test/test_helper.exs
index 3e40eee..4df3bf7 100644
--- a/test/elixir/test/test_helper.exs
+++ b/test/elixir/test/test_helper.exs
@@ -1,4 +1,4 @@
-# If build number detected assum we running on Jenkins
+# If build number detected assume we running on Jenkins
 # and skip certain tests that fail on jenkins.
 exclude =
   case System.get_env("BUILD_NUMBER") !== nil do
diff --git a/test/elixir/test/view_collation_test.exs b/test/elixir/test/view_collation_test.exs
index 031055b..6f9c3be 100644
--- a/test/elixir/test/view_collation_test.exs
+++ b/test/elixir/test/view_collation_test.exs
@@ -70,11 +70,13 @@ defmodule ViewCollationTest do
   end
 
   test "ascending collation order", context do
-    resp = Couch.get(url(context))
-    pairs = Enum.zip(resp.body["rows"], @values)
+    retry_until(fn ->
+      resp = Couch.get(url(context))
+      pairs = Enum.zip(resp.body["rows"], @values)
 
-    Enum.each(pairs, fn {row, value} ->
-      assert row["key"] == convert(value)
+      Enum.each(pairs, fn {row, value} ->
+        assert row["key"] == convert(value)
+      end)
     end)
   end