From a57b7170099e1a6830cef53f3ffff6c874d7b75e Mon Sep 17 00:00:00 2001
From: Alessio Biancalana <dottorblaster@apache.org>
Date: Mon, 31 Aug 2020 19:01:49 +0200
Subject: Tag elixir tests into meaningful groups

---
 test/elixir/test/all_docs_test.exs                 | 1 +
 test/elixir/test/attachment_names_test.exs         | 1 +
 test/elixir/test/attachment_paths_test.exs         | 1 +
 test/elixir/test/attachment_ranges_test.exs        | 1 +
 test/elixir/test/attachment_views_test.exs         | 1 +
 test/elixir/test/attachments_multipart_test.exs    | 1 +
 test/elixir/test/attachments_test.exs              | 1 +
 test/elixir/test/auth_cache_test.exs               | 1 +
 test/elixir/test/basics_test.exs                   | 1 +
 test/elixir/test/batch_save_test.exs               | 1 +
 test/elixir/test/bulk_docs_test.exs                | 1 +
 test/elixir/test/changes_async_test.exs            | 1 +
 test/elixir/test/changes_test.exs                  | 1 +
 test/elixir/test/cluster_with_quorum_test.exs      | 1 +
 test/elixir/test/cluster_without_quorum_test.exs   | 1 +
 test/elixir/test/coffee_test.exs                   | 1 +
 test/elixir/test/compact_test.exs                  | 1 +
 test/elixir/test/config_test.exs                   | 1 +
 test/elixir/test/conflicts_test.exs                | 1 +
 test/elixir/test/cookie_auth_test.exs              | 1 +
 test/elixir/test/copy_doc_test.exs                 | 1 +
 test/elixir/test/design_docs_query_test.exs        | 1 +
 test/elixir/test/design_docs_test.exs              | 1 +
 test/elixir/test/design_options_test.exs           | 1 +
 test/elixir/test/design_paths_test.exs             | 1 +
 test/elixir/test/erlang_views_test.exs             | 1 +
 test/elixir/test/etags_head_test.exs               | 1 +
 test/elixir/test/form_submit_test.exs              | 1 +
 test/elixir/test/helper_test.exs                   | 3 +++
 test/elixir/test/http_test.exs                     | 1 +
 test/elixir/test/invalid_docids_test.exs           | 1 +
 test/elixir/test/jsonp_test.exs                    | 1 +
 test/elixir/test/jwtauth_test.exs                  | 1 +
 test/elixir/test/large_docs_text.exs               | 2 ++
 test/elixir/test/local_docs_test.exs               | 1 +
 test/elixir/test/lots_of_docs_test.exs             | 2 ++
 test/elixir/test/method_override_test.exs          | 1 +
 test/elixir/test/multiple_rows_test.exs            | 1 +
 test/elixir/test/partition_all_docs_test.exs       | 3 +++
 test/elixir/test/partition_crud_test.exs           | 3 +++
 test/elixir/test/partition_ddoc_test.exs           | 3 +++
 test/elixir/test/partition_design_docs_test.exs    | 3 +++
 test/elixir/test/partition_mango_test.exs          | 4 ++++
 test/elixir/test/partition_size_limit_test.exs     | 3 +++
 test/elixir/test/partition_size_test.exs           | 3 +++
 test/elixir/test/partition_view_test.exs           | 3 +++
 test/elixir/test/partition_view_update_test.exs    | 4 ++++
 test/elixir/test/proxyauth_test.exs                | 1 +
 test/elixir/test/purge_test.exs                    | 1 +
 test/elixir/test/reader_acl_test.exs               | 1 +
 test/elixir/test/recreate_doc_test.exs             | 1 +
 test/elixir/test/reduce_builtin_test.exs           | 1 +
 test/elixir/test/reduce_false_test.exs             | 1 +
 test/elixir/test/reduce_test.exs                   | 1 +
 test/elixir/test/replication_test.exs              | 3 +++
 test/elixir/test/replicator_db_bad_rep_id_test.exs | 3 +++
 test/elixir/test/replicator_db_by_doc_id_test.exs  | 3 +++
 test/elixir/test/reshard_all_docs_test.exs         | 2 ++
 test/elixir/test/reshard_basic_test.exs            | 2 ++
 test/elixir/test/reshard_changes_feed.exs          | 2 ++
 test/elixir/test/rev_stemming_test.exs             | 1 +
 test/elixir/test/rewrite_test.exs                  | 1 +
 test/elixir/test/security_validation_test.exs      | 1 +
 test/elixir/test/update_documents_test.exs         | 2 ++
 test/elixir/test/users_db_test.exs                 | 1 +
 test/elixir/test/utf8_test.exs                     | 1 +
 test/elixir/test/uuids_test.exs                    | 3 +++
 test/elixir/test/view_collation_raw_test.exs       | 2 ++
 test/elixir/test/view_collation_test.exs           | 2 ++
 test/elixir/test/view_compaction_test.exs          | 3 +++
 test/elixir/test/view_multi_key_all_docs_test.exs  | 2 ++
 test/elixir/test/view_multi_key_design_test.exs    | 2 ++
 test/elixir/test/view_offsets_test.exs             | 1 +
 test/elixir/test/view_pagination_test.exs          | 1 +
 test/elixir/test/view_sandboxing_test.exs          | 2 ++
 test/elixir/test/view_test.exs                     | 1 +
 test/elixir/test/view_update_seq_test.exs          | 1 +
 77 files changed, 120 insertions(+)

diff --git a/test/elixir/test/all_docs_test.exs b/test/elixir/test/all_docs_test.exs
index a091dce55..b9fb6f241 100644
--- a/test/elixir/test/all_docs_test.exs
+++ b/test/elixir/test/all_docs_test.exs
@@ -2,6 +2,7 @@ defmodule AllDocsTest do
   use CouchTestCase
 
   @moduletag :all_docs
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB _all_docs
diff --git a/test/elixir/test/attachment_names_test.exs b/test/elixir/test/attachment_names_test.exs
index 4593a8504..66596c865 100644
--- a/test/elixir/test/attachment_names_test.exs
+++ b/test/elixir/test/attachment_names_test.exs
@@ -2,6 +2,7 @@ defmodule AttachmentNamesTest do
   use CouchTestCase
 
   @moduletag :attachments
+  @moduletag kind: :single_node
 
   @good_doc """
    {
diff --git a/test/elixir/test/attachment_paths_test.exs b/test/elixir/test/attachment_paths_test.exs
index b776feabf..4c79eca1c 100644
--- a/test/elixir/test/attachment_paths_test.exs
+++ b/test/elixir/test/attachment_paths_test.exs
@@ -2,6 +2,7 @@ defmodule AttachmentPathsTest do
   use CouchTestCase
 
   @moduletag :attachments
+  @moduletag kind: :single_node
 
   @bin_att_doc """
   {
diff --git a/test/elixir/test/attachment_ranges_test.exs b/test/elixir/test/attachment_ranges_test.exs
index 01c1239bc..de39836b0 100644
--- a/test/elixir/test/attachment_ranges_test.exs
+++ b/test/elixir/test/attachment_ranges_test.exs
@@ -2,6 +2,7 @@ defmodule AttachmentRangesTest do
   use CouchTestCase
 
   @moduletag :attachments
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB attachment range requests
diff --git a/test/elixir/test/attachment_views_test.exs b/test/elixir/test/attachment_views_test.exs
index 3da62f042..044008531 100644
--- a/test/elixir/test/attachment_views_test.exs
+++ b/test/elixir/test/attachment_views_test.exs
@@ -2,6 +2,7 @@ defmodule AttachmentViewTest do
   use CouchTestCase
 
   @moduletag :attachments
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB attachment views requests
diff --git a/test/elixir/test/attachments_multipart_test.exs b/test/elixir/test/attachments_multipart_test.exs
index f7d5d9519..f635377a1 100644
--- a/test/elixir/test/attachments_multipart_test.exs
+++ b/test/elixir/test/attachments_multipart_test.exs
@@ -2,6 +2,7 @@ defmodule AttachmentMultipartTest do
   use CouchTestCase
 
   @moduletag :attachments
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB attachment multipart requests
diff --git a/test/elixir/test/attachments_test.exs b/test/elixir/test/attachments_test.exs
index 020003377..8e7f7d352 100644
--- a/test/elixir/test/attachments_test.exs
+++ b/test/elixir/test/attachments_test.exs
@@ -2,6 +2,7 @@ defmodule AttachmentsTest do
   use CouchTestCase
 
   @moduletag :attachments
+  @moduletag kind: :single_node
 
   #  MD5 Digests of compressible attachments and therefore Etags
   #  will vary depending on platform gzip implementation.
diff --git a/test/elixir/test/auth_cache_test.exs b/test/elixir/test/auth_cache_test.exs
index 8b7c29c71..5c446f039 100644
--- a/test/elixir/test/auth_cache_test.exs
+++ b/test/elixir/test/auth_cache_test.exs
@@ -2,6 +2,7 @@ defmodule AuthCacheTest do
   use CouchTestCase
 
   @moduletag :authentication
+  @moduletag kind: :single_node
 
   @tag :pending
   @tag :with_db
diff --git a/test/elixir/test/basics_test.exs b/test/elixir/test/basics_test.exs
index a03fa2922..359ba6040 100644
--- a/test/elixir/test/basics_test.exs
+++ b/test/elixir/test/basics_test.exs
@@ -2,6 +2,7 @@ defmodule BasicsTest do
   use CouchTestCase
 
   @moduletag :basics
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB basics.
diff --git a/test/elixir/test/batch_save_test.exs b/test/elixir/test/batch_save_test.exs
index 030fcdfba..f13fcdc9f 100644
--- a/test/elixir/test/batch_save_test.exs
+++ b/test/elixir/test/batch_save_test.exs
@@ -2,6 +2,7 @@ defmodule BatchSaveTest do
   use CouchTestCase
 
   @moduletag :batch_save
+  @moduletag kind: :performance
 
   @moduledoc """
   Test CouchDB batch save
diff --git a/test/elixir/test/bulk_docs_test.exs b/test/elixir/test/bulk_docs_test.exs
index 1a7c11045..cbbc53340 100644
--- a/test/elixir/test/bulk_docs_test.exs
+++ b/test/elixir/test/bulk_docs_test.exs
@@ -2,6 +2,7 @@ defmodule BulkDocsTest do
   use CouchTestCase
 
   @moduletag :bulk_docs
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB bulk docs
diff --git a/test/elixir/test/changes_async_test.exs b/test/elixir/test/changes_async_test.exs
index 07afcdc7c..36876aedf 100644
--- a/test/elixir/test/changes_async_test.exs
+++ b/test/elixir/test/changes_async_test.exs
@@ -2,6 +2,7 @@ defmodule ChangesAsyncTest do
   use CouchTestCase
 
   @moduletag :changes
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB /{db}/_changes
diff --git a/test/elixir/test/changes_test.exs b/test/elixir/test/changes_test.exs
index 5bb376b9c..ad579a99a 100644
--- a/test/elixir/test/changes_test.exs
+++ b/test/elixir/test/changes_test.exs
@@ -2,6 +2,7 @@ defmodule ChangesTest do
   use CouchTestCase
 
   @moduletag :changes
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB /{db}/_changes
diff --git a/test/elixir/test/cluster_with_quorum_test.exs b/test/elixir/test/cluster_with_quorum_test.exs
index fc3b28a0b..dc3d66be3 100644
--- a/test/elixir/test/cluster_with_quorum_test.exs
+++ b/test/elixir/test/cluster_with_quorum_test.exs
@@ -2,6 +2,7 @@ defmodule WithQuorumTest do
   use CouchTestCase
 
   @moduletag :with_quorum_test
+  @moduletag kind: :cluster
 
   @moduledoc """
   Test CouchDB API in a cluster without quorum.
diff --git a/test/elixir/test/cluster_without_quorum_test.exs b/test/elixir/test/cluster_without_quorum_test.exs
index e0095c351..63371f1a6 100644
--- a/test/elixir/test/cluster_without_quorum_test.exs
+++ b/test/elixir/test/cluster_without_quorum_test.exs
@@ -2,6 +2,7 @@ defmodule WithoutQuorumTest do
   use CouchTestCase
 
   @moduletag :without_quorum_test
+  @moduletag kind: :degraded_cluster
 
   @moduledoc """
   Test CouchDB API in a cluster without quorum.
diff --git a/test/elixir/test/coffee_test.exs b/test/elixir/test/coffee_test.exs
index 3b26f5e59..3c7a1052b 100644
--- a/test/elixir/test/coffee_test.exs
+++ b/test/elixir/test/coffee_test.exs
@@ -2,6 +2,7 @@ defmodule CoffeeTest do
   use CouchTestCase
 
   @moduletag :coffee
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test basic coffeescript functionality.
diff --git a/test/elixir/test/compact_test.exs b/test/elixir/test/compact_test.exs
index 461a1d347..18aeab2de 100644
--- a/test/elixir/test/compact_test.exs
+++ b/test/elixir/test/compact_test.exs
@@ -2,6 +2,7 @@ defmodule CompactTest do
   use CouchTestCase
 
   @moduletag :compact
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB compaction
diff --git a/test/elixir/test/config_test.exs b/test/elixir/test/config_test.exs
index 53c5bc82e..bb89d8683 100644
--- a/test/elixir/test/config_test.exs
+++ b/test/elixir/test/config_test.exs
@@ -2,6 +2,7 @@ defmodule ConfigTest do
   use CouchTestCase
 
   @moduletag :config
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB config API
diff --git a/test/elixir/test/conflicts_test.exs b/test/elixir/test/conflicts_test.exs
index a45f5c4ed..adf16bc4d 100644
--- a/test/elixir/test/conflicts_test.exs
+++ b/test/elixir/test/conflicts_test.exs
@@ -2,6 +2,7 @@ defmodule RevisionTest do
   use CouchTestCase
 
   @moduletag :conflicts
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB conflicts
diff --git a/test/elixir/test/cookie_auth_test.exs b/test/elixir/test/cookie_auth_test.exs
index abc0fd767..87de1abd3 100644
--- a/test/elixir/test/cookie_auth_test.exs
+++ b/test/elixir/test/cookie_auth_test.exs
@@ -2,6 +2,7 @@ defmodule CookieAuthTest do
   use CouchTestCase
 
   @moduletag :authentication
+  @moduletag kind: :single_node
 
   @users_db "_users"
 
diff --git a/test/elixir/test/copy_doc_test.exs b/test/elixir/test/copy_doc_test.exs
index 4641ff6ea..f227fdac5 100644
--- a/test/elixir/test/copy_doc_test.exs
+++ b/test/elixir/test/copy_doc_test.exs
@@ -2,6 +2,7 @@ defmodule CopyDocTest do
   use CouchTestCase
 
   @moduletag :copy_doc
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB Copy Doc
diff --git a/test/elixir/test/design_docs_query_test.exs b/test/elixir/test/design_docs_query_test.exs
index b439a2e02..9784f8deb 100644
--- a/test/elixir/test/design_docs_query_test.exs
+++ b/test/elixir/test/design_docs_query_test.exs
@@ -2,6 +2,7 @@ defmodule DesignDocsQueryTest do
   use CouchTestCase
 
   @moduletag :design_docs
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB /{db}/_design_docs
diff --git a/test/elixir/test/design_docs_test.exs b/test/elixir/test/design_docs_test.exs
index 258f5f72f..86bdd5aa5 100644
--- a/test/elixir/test/design_docs_test.exs
+++ b/test/elixir/test/design_docs_test.exs
@@ -2,6 +2,7 @@ defmodule DesignDocsTest do
   use CouchTestCase
 
   @moduletag :design_docs
+  @moduletag kind: :single_node
 
   @design_doc %{
     _id: "_design/test",
diff --git a/test/elixir/test/design_options_test.exs b/test/elixir/test/design_options_test.exs
index 95a938e38..feb47714d 100644
--- a/test/elixir/test/design_options_test.exs
+++ b/test/elixir/test/design_options_test.exs
@@ -2,6 +2,7 @@ defmodule DesignOptionsTest do
   use CouchTestCase
 
   @moduletag :design_docs
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB design documents options include_design and local_seq
diff --git a/test/elixir/test/design_paths_test.exs b/test/elixir/test/design_paths_test.exs
index b3e10c165..f90172a08 100644
--- a/test/elixir/test/design_paths_test.exs
+++ b/test/elixir/test/design_paths_test.exs
@@ -2,6 +2,7 @@ defmodule DesignPathTest do
   use CouchTestCase
 
   @moduletag :design_docs
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB design documents path
diff --git a/test/elixir/test/erlang_views_test.exs b/test/elixir/test/erlang_views_test.exs
index 3346c2274..afe9d6ccb 100644
--- a/test/elixir/test/erlang_views_test.exs
+++ b/test/elixir/test/erlang_views_test.exs
@@ -2,6 +2,7 @@ defmodule ErlangViewsTest do
   use CouchTestCase
 
   @moduletag :erlang_views
+  @moduletag kind: :single_node
 
   @moduledoc """
   basic 'smoke tests' of erlang views.
diff --git a/test/elixir/test/etags_head_test.exs b/test/elixir/test/etags_head_test.exs
index 9b9ff8bb0..beb12bdd0 100644
--- a/test/elixir/test/etags_head_test.exs
+++ b/test/elixir/test/etags_head_test.exs
@@ -2,6 +2,7 @@ defmodule EtagsHeadTest do
   use CouchTestCase
 
   @moduletag :etags
+  @moduletag kind: :single_node
 
   @tag :with_db
   test "etag header on creation", context do
diff --git a/test/elixir/test/form_submit_test.exs b/test/elixir/test/form_submit_test.exs
index 1baf947ac..099f395fc 100644
--- a/test/elixir/test/form_submit_test.exs
+++ b/test/elixir/test/form_submit_test.exs
@@ -2,6 +2,7 @@ defmodule FormSubmitTest do
   use CouchTestCase
 
   @moduletag :form_submit
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test that form submission is invalid
diff --git a/test/elixir/test/helper_test.exs b/test/elixir/test/helper_test.exs
index 19d70eac8..1e498a15c 100644
--- a/test/elixir/test/helper_test.exs
+++ b/test/elixir/test/helper_test.exs
@@ -5,6 +5,9 @@ defmodule HelperTest do
   Test helper code
   """
 
+  @moduletag :helper
+  @moduletag kind: :single_node
+
   test "retry_until handles boolean conditions", _context do
     retry_until(fn ->
       true
diff --git a/test/elixir/test/http_test.exs b/test/elixir/test/http_test.exs
index 09d743060..14cecfe7b 100644
--- a/test/elixir/test/http_test.exs
+++ b/test/elixir/test/http_test.exs
@@ -2,6 +2,7 @@ defmodule HttpTest do
   use CouchTestCase
 
   @moduletag :http
+  @moduletag kind: :single_node
 
   @tag :with_db
   test "location header", context do
diff --git a/test/elixir/test/invalid_docids_test.exs b/test/elixir/test/invalid_docids_test.exs
index edce5cc65..c1d30c5fc 100644
--- a/test/elixir/test/invalid_docids_test.exs
+++ b/test/elixir/test/invalid_docids_test.exs
@@ -2,6 +2,7 @@ defmodule InvalidDocIDsTest do
   use CouchTestCase
 
   @moduletag :invalid_doc_ids
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test invalid document ids
diff --git a/test/elixir/test/jsonp_test.exs b/test/elixir/test/jsonp_test.exs
index 3fdc2ba5f..2e1934a22 100644
--- a/test/elixir/test/jsonp_test.exs
+++ b/test/elixir/test/jsonp_test.exs
@@ -2,6 +2,7 @@ defmodule JsonpTest do
   use CouchTestCase
 
   @moduletag :jsonp
+  @moduletag kind: :single_node
 
   @tag :with_db
   test "jsonp not configured callbacks", context do
diff --git a/test/elixir/test/jwtauth_test.exs b/test/elixir/test/jwtauth_test.exs
index 7281ed146..7b6fe4a33 100644
--- a/test/elixir/test/jwtauth_test.exs
+++ b/test/elixir/test/jwtauth_test.exs
@@ -2,6 +2,7 @@ defmodule JwtAuthTest do
   use CouchTestCase
 
   @moduletag :authentication
+  @moduletag kind: :single_node
 
   test "jwt auth with HMAC secret", _context do
 
diff --git a/test/elixir/test/large_docs_text.exs b/test/elixir/test/large_docs_text.exs
index 4d2c5dede..b80add60e 100644
--- a/test/elixir/test/large_docs_text.exs
+++ b/test/elixir/test/large_docs_text.exs
@@ -2,6 +2,8 @@ defmodule LargeDocsTest do
   use CouchTestCase
 
   @moduletag :large_docs
+  @moduletag kind: :single_node
+
   @long_string "0123456789\n"
 
   @moduledoc """
diff --git a/test/elixir/test/local_docs_test.exs b/test/elixir/test/local_docs_test.exs
index ff071f3e6..d7ed137c8 100644
--- a/test/elixir/test/local_docs_test.exs
+++ b/test/elixir/test/local_docs_test.exs
@@ -2,6 +2,7 @@ defmodule LocalDocsTest do
   use CouchTestCase
 
   @moduletag :local_docs
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB _local_docs
diff --git a/test/elixir/test/lots_of_docs_test.exs b/test/elixir/test/lots_of_docs_test.exs
index c0cc99198..6f2e9f7c8 100644
--- a/test/elixir/test/lots_of_docs_test.exs
+++ b/test/elixir/test/lots_of_docs_test.exs
@@ -2,6 +2,8 @@ defmodule LotsOfDocsTest do
   use CouchTestCase
 
   @moduletag :lots_of_docs
+  @moduletag kind: :performance
+  
   @docs_range 0..499
 
   @moduledoc """
diff --git a/test/elixir/test/method_override_test.exs b/test/elixir/test/method_override_test.exs
index c67fe3966..e264a870a 100644
--- a/test/elixir/test/method_override_test.exs
+++ b/test/elixir/test/method_override_test.exs
@@ -2,6 +2,7 @@ defmodule MethodOverrideTest do
   use CouchTestCase
 
   @moduletag :http
+  @moduletag kind: :single_node
 
   @moduledoc """
    Allow broken HTTP clients to fake a full method vocabulary with an
diff --git a/test/elixir/test/multiple_rows_test.exs b/test/elixir/test/multiple_rows_test.exs
index 646682823..422b254b0 100644
--- a/test/elixir/test/multiple_rows_test.exs
+++ b/test/elixir/test/multiple_rows_test.exs
@@ -2,6 +2,7 @@ defmodule MultipleRowsTest do
   use CouchTestCase
 
   @moduletag :multiple_rows
+  @moduletag kind: :single_node
 
   @north_carolina_cities ["Charlotte", "Raleigh"]
   @massachussets_cities ["Boston", "Lowell", "Worcester", "Cambridge", "Springfield"]
diff --git a/test/elixir/test/partition_all_docs_test.exs b/test/elixir/test/partition_all_docs_test.exs
index 816a8d6ed..8abc635f6 100644
--- a/test/elixir/test/partition_all_docs_test.exs
+++ b/test/elixir/test/partition_all_docs_test.exs
@@ -6,6 +6,9 @@ defmodule PartitionAllDocsTest do
   Test Partition functionality for for all_docs
   """
 
+  @moduletag :partition
+  @moduletag kind: :cluster
+
   setup_all do
     db_name = random_db_name()
     {:ok, _} = create_db(db_name, query: %{partitioned: true, q: 1})
diff --git a/test/elixir/test/partition_crud_test.exs b/test/elixir/test/partition_crud_test.exs
index 7e32abbdc..f4a23ed28 100644
--- a/test/elixir/test/partition_crud_test.exs
+++ b/test/elixir/test/partition_crud_test.exs
@@ -1,6 +1,9 @@
 defmodule PartitionCrudTest do
   use CouchTestCase
 
+  @moduletag :partition
+  @moduletag kind: :cluster
+
   @tag :with_partitioned_db
   test "Sets partition in db info", context do
     db_name = context[:db_name]
diff --git a/test/elixir/test/partition_ddoc_test.exs b/test/elixir/test/partition_ddoc_test.exs
index 9fdfb9260..353d52af1 100644
--- a/test/elixir/test/partition_ddoc_test.exs
+++ b/test/elixir/test/partition_ddoc_test.exs
@@ -4,6 +4,9 @@ defmodule PartitionDDocTest do
   @moduledoc """
   Test partition design doc interactions
   """
+  
+  @moduletag :partition
+  @moduletag kind: :cluster
 
   setup do
     db_name = random_db_name()
diff --git a/test/elixir/test/partition_design_docs_test.exs b/test/elixir/test/partition_design_docs_test.exs
index 4ccd63fe0..0de95b1fc 100644
--- a/test/elixir/test/partition_design_docs_test.exs
+++ b/test/elixir/test/partition_design_docs_test.exs
@@ -5,6 +5,9 @@ defmodule PartitionDesignDocsTest do
   Test Partition functionality for partition design docs
   """
 
+  @moduletag :partition
+  @moduletag kind: :cluster
+
   @tag :with_partitioned_db
   test "/_partition/:pk/_design/doc 404", context do
     db_name = context[:db_name]
diff --git a/test/elixir/test/partition_mango_test.exs b/test/elixir/test/partition_mango_test.exs
index 9e4f1e783..e203bac5b 100644
--- a/test/elixir/test/partition_mango_test.exs
+++ b/test/elixir/test/partition_mango_test.exs
@@ -5,6 +5,10 @@ defmodule PartitionMangoTest do
   @moduledoc """
   Test Partition functionality for mango
   """
+
+  @moduletag :partition
+  @moduletag kind: :cluster
+
   def create_index(db_name, fields \\ ["some"], opts \\ %{}) do
     default_index = %{
       index: %{
diff --git a/test/elixir/test/partition_size_limit_test.exs b/test/elixir/test/partition_size_limit_test.exs
index 6ef686611..de857bd31 100644
--- a/test/elixir/test/partition_size_limit_test.exs
+++ b/test/elixir/test/partition_size_limit_test.exs
@@ -5,6 +5,9 @@ defmodule PartitionSizeLimitTest do
   Test Partition size limit functionality
   """
 
+  @moduletag :partition
+  @moduletag kind: :cluster
+
   @max_size 10_240
 
   setup do
diff --git a/test/elixir/test/partition_size_test.exs b/test/elixir/test/partition_size_test.exs
index 2ba8139fc..5dfa5b5d8 100644
--- a/test/elixir/test/partition_size_test.exs
+++ b/test/elixir/test/partition_size_test.exs
@@ -4,6 +4,9 @@ defmodule PartitionSizeTest do
   @moduledoc """
   Test Partition size functionality
   """
+  
+  @moduletag :partition
+  @moduletag kind: :cluster
 
   setup do
     db_name = random_db_name()
diff --git a/test/elixir/test/partition_view_test.exs b/test/elixir/test/partition_view_test.exs
index 0a55c2443..bea5e1d8c 100644
--- a/test/elixir/test/partition_view_test.exs
+++ b/test/elixir/test/partition_view_test.exs
@@ -5,6 +5,9 @@ defmodule ViewPartitionTest do
   @moduledoc """
   Test Partition functionality for views
   """
+  
+  @moduletag :partition
+  @moduletag kind: :cluster
 
   setup_all do
     db_name = random_db_name()
diff --git a/test/elixir/test/partition_view_update_test.exs b/test/elixir/test/partition_view_update_test.exs
index 5c1cb09f0..390e14198 100644
--- a/test/elixir/test/partition_view_update_test.exs
+++ b/test/elixir/test/partition_view_update_test.exs
@@ -5,6 +5,10 @@ defmodule PartitionViewUpdateTest do
   @moduledoc """
   Test Partition view update functionality
   """
+  
+  @moduletag :partition
+  @moduletag kind: :cluster
+
   @tag :with_partitioned_db
   test "view updates properly remove old keys", context do
     db_name = context[:db_name]
diff --git a/test/elixir/test/proxyauth_test.exs b/test/elixir/test/proxyauth_test.exs
index 6f2d49a53..b152e9bd5 100644
--- a/test/elixir/test/proxyauth_test.exs
+++ b/test/elixir/test/proxyauth_test.exs
@@ -2,6 +2,7 @@ defmodule ProxyAuthTest do
   use CouchTestCase
 
   @moduletag :authentication
+  @moduletag kind: :single_node
 
   @tag :with_db
   test "proxy auth with secret", context do
diff --git a/test/elixir/test/purge_test.exs b/test/elixir/test/purge_test.exs
index 5fc03f16b..1a069083b 100644
--- a/test/elixir/test/purge_test.exs
+++ b/test/elixir/test/purge_test.exs
@@ -2,6 +2,7 @@ defmodule PurgeTest do
   use CouchTestCase
 
   @moduletag :purge
+  @moduletag kind: :single_node
 
   @tag :with_db
   test "purge documents", context do
diff --git a/test/elixir/test/reader_acl_test.exs b/test/elixir/test/reader_acl_test.exs
index f65e7cbf6..3cbd5c886 100644
--- a/test/elixir/test/reader_acl_test.exs
+++ b/test/elixir/test/reader_acl_test.exs
@@ -2,6 +2,7 @@ defmodule ReaderACLTest do
   use CouchTestCase
 
   @moduletag :authentication
+  @moduletag kind: :single_node
 
   @users_db_name "custom-users"
   @password "funnybone"
diff --git a/test/elixir/test/recreate_doc_test.exs b/test/elixir/test/recreate_doc_test.exs
index 08f92293e..9ee914dc2 100644
--- a/test/elixir/test/recreate_doc_test.exs
+++ b/test/elixir/test/recreate_doc_test.exs
@@ -2,6 +2,7 @@ defmodule RecreateDocTest do
   use CouchTestCase
 
   @moduletag :recreate_doc
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB document recreation
diff --git a/test/elixir/test/reduce_builtin_test.exs b/test/elixir/test/reduce_builtin_test.exs
index d13ada1b3..410ca5989 100644
--- a/test/elixir/test/reduce_builtin_test.exs
+++ b/test/elixir/test/reduce_builtin_test.exs
@@ -2,6 +2,7 @@ defmodule ReduceBuiltinTest do
   use CouchTestCase
 
   @moduletag :views
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB view builtin reduce functions
diff --git a/test/elixir/test/reduce_false_test.exs b/test/elixir/test/reduce_false_test.exs
index 675c11dbd..3cf4ccb49 100644
--- a/test/elixir/test/reduce_false_test.exs
+++ b/test/elixir/test/reduce_false_test.exs
@@ -2,6 +2,7 @@ defmodule ReduceFalseTest do
   use CouchTestCase
 
   @moduletag :views
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB view without reduces
diff --git a/test/elixir/test/reduce_test.exs b/test/elixir/test/reduce_test.exs
index 22f2fa6f2..7b5641ccf 100644
--- a/test/elixir/test/reduce_test.exs
+++ b/test/elixir/test/reduce_test.exs
@@ -2,6 +2,7 @@ defmodule ReduceTest do
   use CouchTestCase
 
   @moduletag :views
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB view reduces
diff --git a/test/elixir/test/replication_test.exs b/test/elixir/test/replication_test.exs
index 075f65bfa..7b462bdfc 100644
--- a/test/elixir/test/replication_test.exs
+++ b/test/elixir/test/replication_test.exs
@@ -5,6 +5,9 @@ defmodule ReplicationTest do
   Test CouchDB Replication Behavior
   This is a port of the view_collation.js suite
   """
+  
+  @moduletag kind: :cluster
+  @moduletag :replication
 
   # TODO: Parameterize these
   @db_pairs_prefixes [
diff --git a/test/elixir/test/replicator_db_bad_rep_id_test.exs b/test/elixir/test/replicator_db_bad_rep_id_test.exs
index 693c9d85d..9477eb183 100644
--- a/test/elixir/test/replicator_db_bad_rep_id_test.exs
+++ b/test/elixir/test/replicator_db_bad_rep_id_test.exs
@@ -5,6 +5,9 @@ defmodule ReplicationBadIdTest do
   This is a port of the replicator_db_bad_rep_id.js suite
   """
 
+  @moduletag :replication
+  @moduletag kind: :cluster
+
   @docs [
     %{
       _id: "foo1",
diff --git a/test/elixir/test/replicator_db_by_doc_id_test.exs b/test/elixir/test/replicator_db_by_doc_id_test.exs
index 2e68f2ca9..681ed02df 100644
--- a/test/elixir/test/replicator_db_by_doc_id_test.exs
+++ b/test/elixir/test/replicator_db_by_doc_id_test.exs
@@ -5,6 +5,9 @@ defmodule ReplicatorDBByDocIdTest do
   This is a port of the replicator_db_by_doc_id.js suite
   """
 
+  @moduletag :replication
+  @moduletag kind: :cluster
+
   @docs [
     %{
       _id: "foo1",
diff --git a/test/elixir/test/reshard_all_docs_test.exs b/test/elixir/test/reshard_all_docs_test.exs
index ab8c6b75b..042437e6e 100644
--- a/test/elixir/test/reshard_all_docs_test.exs
+++ b/test/elixir/test/reshard_all_docs_test.exs
@@ -6,6 +6,8 @@ defmodule ReshardAllDocsTest do
   Test _all_docs interaction with resharding
   """
 
+  @moduletag kind: :cluster
+
   setup do
     db = random_db_name()
     {:ok, _} = create_db(db, query: %{q: 2})
diff --git a/test/elixir/test/reshard_basic_test.exs b/test/elixir/test/reshard_basic_test.exs
index dcb198c46..92f8145bf 100644
--- a/test/elixir/test/reshard_basic_test.exs
+++ b/test/elixir/test/reshard_basic_test.exs
@@ -5,6 +5,8 @@ defmodule ReshardBasicTest do
   @moduledoc """
   Test resharding basic functionality
   """
+  
+  @moduletag kind: :cluster
 
   setup_all do
     db1 = random_db_name()
diff --git a/test/elixir/test/reshard_changes_feed.exs b/test/elixir/test/reshard_changes_feed.exs
index 5498ded7b..ad55e577d 100644
--- a/test/elixir/test/reshard_changes_feed.exs
+++ b/test/elixir/test/reshard_changes_feed.exs
@@ -6,6 +6,8 @@ defmodule ReshardChangesFeedTest do
   Test _changes interaction with resharding
   """
 
+  @moduletag kind: :cluster
+
   setup do
     db = random_db_name()
     {:ok, _} = create_db(db, query: %{q: 2})
diff --git a/test/elixir/test/rev_stemming_test.exs b/test/elixir/test/rev_stemming_test.exs
index 9a16d481d..1fb745ead 100644
--- a/test/elixir/test/rev_stemming_test.exs
+++ b/test/elixir/test/rev_stemming_test.exs
@@ -2,6 +2,7 @@ defmodule RevStemmingTest do
   use CouchTestCase
 
   @moduletag :revs
+  @moduletag kind: :single_node
 
   @moduledoc """
   This is a port of the rev_stemming.js suite
diff --git a/test/elixir/test/rewrite_test.exs b/test/elixir/test/rewrite_test.exs
index 1960ddfde..daa2a80a8 100644
--- a/test/elixir/test/rewrite_test.exs
+++ b/test/elixir/test/rewrite_test.exs
@@ -2,6 +2,7 @@ defmodule RewriteTest do
   use CouchTestCase
 
   @moduletag :js_engine
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB rewrites
diff --git a/test/elixir/test/security_validation_test.exs b/test/elixir/test/security_validation_test.exs
index 0df3a780b..036d4a7a9 100644
--- a/test/elixir/test/security_validation_test.exs
+++ b/test/elixir/test/security_validation_test.exs
@@ -2,6 +2,7 @@ defmodule SecurityValidationTest do
   use CouchTestCase
 
   @moduletag :security
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB Security Validations
diff --git a/test/elixir/test/update_documents_test.exs b/test/elixir/test/update_documents_test.exs
index c29b31a4d..fcbdbeaca 100644
--- a/test/elixir/test/update_documents_test.exs
+++ b/test/elixir/test/update_documents_test.exs
@@ -1,6 +1,8 @@
 defmodule UpdateDocumentsTest do
   use CouchTestCase
 
+  @moduletag kind: :single_node
+
   @ddoc %{
     _id: "_design/update",
     language: "javascript",
diff --git a/test/elixir/test/users_db_test.exs b/test/elixir/test/users_db_test.exs
index 62877d542..db86b2739 100644
--- a/test/elixir/test/users_db_test.exs
+++ b/test/elixir/test/users_db_test.exs
@@ -2,6 +2,7 @@ defmodule UsersDbTest do
   use CouchTestCase
 
   @moduletag :authentication
+  @moduletag kind: :single_node
 
   @users_db_name "_users"
 
diff --git a/test/elixir/test/utf8_test.exs b/test/elixir/test/utf8_test.exs
index 0e4d8b875..6afaee606 100644
--- a/test/elixir/test/utf8_test.exs
+++ b/test/elixir/test/utf8_test.exs
@@ -2,6 +2,7 @@ defmodule UTF8Test do
   use CouchTestCase
 
   @moduletag :utf8
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB UTF8 support
diff --git a/test/elixir/test/uuids_test.exs b/test/elixir/test/uuids_test.exs
index bb9369b80..355bed824 100644
--- a/test/elixir/test/uuids_test.exs
+++ b/test/elixir/test/uuids_test.exs
@@ -6,6 +6,9 @@ defmodule UUIDsTest do
   This is a port of the uuids.js suite
   """
 
+  @moduletag :docs
+  @moduletag kind: :single_node
+
   test "cache busting headers are set" do
     resp = Couch.get("/_uuids")
     assert resp.status_code == 200
diff --git a/test/elixir/test/view_collation_raw_test.exs b/test/elixir/test/view_collation_raw_test.exs
index ee272d72e..1bcd397d9 100644
--- a/test/elixir/test/view_collation_raw_test.exs
+++ b/test/elixir/test/view_collation_raw_test.exs
@@ -6,6 +6,8 @@ defmodule ViewCollationRawTest do
   This is a port of the view_collation_raw.js suite
   """
 
+  @moduletag kind: :single_node
+
   @values [
     # Then numbers
     1,
diff --git a/test/elixir/test/view_collation_test.exs b/test/elixir/test/view_collation_test.exs
index 7563ba416..1e3fec03f 100644
--- a/test/elixir/test/view_collation_test.exs
+++ b/test/elixir/test/view_collation_test.exs
@@ -6,6 +6,8 @@ defmodule ViewCollationTest do
   This is a port of the view_collation.js suite
   """
 
+  @moduletag kind: :single_node
+
   @values [
     # Special values sort before all other types
     :null,
diff --git a/test/elixir/test/view_compaction_test.exs b/test/elixir/test/view_compaction_test.exs
index d2bf060ba..5bdd2eac1 100644
--- a/test/elixir/test/view_compaction_test.exs
+++ b/test/elixir/test/view_compaction_test.exs
@@ -5,6 +5,9 @@ defmodule ViewCompactionTest do
   Test CouchDB View Compaction Behavior
   This is a port of the view_compaction.js suite
   """
+  
+  @moduletag kind: :single_node
+  
   @num_docs 1000
 
   @ddoc %{
diff --git a/test/elixir/test/view_multi_key_all_docs_test.exs b/test/elixir/test/view_multi_key_all_docs_test.exs
index d9fa41e23..6426eb2c2 100644
--- a/test/elixir/test/view_multi_key_all_docs_test.exs
+++ b/test/elixir/test/view_multi_key_all_docs_test.exs
@@ -1,6 +1,8 @@
 defmodule ViewMultiKeyAllDocsTest do
   use CouchTestCase
 
+  @moduletag kind: :single_node
+
   @keys ["10", "15", "30", "37", "50"]
 
   setup_all do
diff --git a/test/elixir/test/view_multi_key_design_test.exs b/test/elixir/test/view_multi_key_design_test.exs
index ab57e89eb..1ea3fe334 100644
--- a/test/elixir/test/view_multi_key_design_test.exs
+++ b/test/elixir/test/view_multi_key_design_test.exs
@@ -1,5 +1,7 @@
 defmodule ViewMultiKeyDesignTest do
   use CouchTestCase
+  
+  @moduletag kind: :single_node
 
   @keys [10, 15, 30, 37, 50]
 
diff --git a/test/elixir/test/view_offsets_test.exs b/test/elixir/test/view_offsets_test.exs
index 20aa1ca9d..9361a54ae 100644
--- a/test/elixir/test/view_offsets_test.exs
+++ b/test/elixir/test/view_offsets_test.exs
@@ -2,6 +2,7 @@ defmodule ViewOffsetTest do
   use CouchTestCase
 
   @moduletag :view_offsets
+  @moduletag kind: :single_node
 
   @moduledoc """
   Tests about view offsets.
diff --git a/test/elixir/test/view_pagination_test.exs b/test/elixir/test/view_pagination_test.exs
index 322b653cb..5aa1cd789 100644
--- a/test/elixir/test/view_pagination_test.exs
+++ b/test/elixir/test/view_pagination_test.exs
@@ -2,6 +2,7 @@ defmodule ViewPaginationTest do
   use CouchTestCase
 
   @moduletag :view_pagination
+  @moduletag kind: :single_node
 
   @moduledoc """
   Integration tests for pagination.
diff --git a/test/elixir/test/view_sandboxing_test.exs b/test/elixir/test/view_sandboxing_test.exs
index af0928efa..99a9c0de4 100644
--- a/test/elixir/test/view_sandboxing_test.exs
+++ b/test/elixir/test/view_sandboxing_test.exs
@@ -1,6 +1,8 @@
 defmodule ViewSandboxingTest do
   use CouchTestCase
 
+  @moduletag kind: :single_node
+
   @document %{integer: 1, string: "1", array: [1, 2, 3]}
 
   @tag :with_db
diff --git a/test/elixir/test/view_test.exs b/test/elixir/test/view_test.exs
index 5fb8c009c..f768cef16 100644
--- a/test/elixir/test/view_test.exs
+++ b/test/elixir/test/view_test.exs
@@ -2,6 +2,7 @@ defmodule ViewTest do
   use CouchTestCase
 
   @moduletag :view
+  @moduletag kind: :single_node
 
   @moduledoc """
   Test CouchDB /{db}/_design/{ddoc}/_view/{view}
diff --git a/test/elixir/test/view_update_seq_test.exs b/test/elixir/test/view_update_seq_test.exs
index 38b42c7a7..d1eca4038 100644
--- a/test/elixir/test/view_update_seq_test.exs
+++ b/test/elixir/test/view_update_seq_test.exs
@@ -2,6 +2,7 @@ defmodule ViewUpdateSeqTest do
   use CouchTestCase
 
   @moduletag :view_update_seq
+  @moduletag kind: :single_node
 
   @moduledoc """
   This is a port of the view_update_seq.js test suite.
-- 
cgit v1.2.1