From: Christophe Romain <christophe.romain@process-one.net>
Date: Tue, 4 Apr 2017 15:02:15 +0000 (+0200)
Subject: Disable mix tests
X-Git-Tag: 17.04~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=578ecad93cd56007ab427ad84ff40dde84afdcfc;p=ejabberd

Disable mix tests
---

diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 36a306b59..54501d177 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -427,7 +427,6 @@ db_tests(DB) when DB == mnesia; DB == redis ->
        muc_tests:single_cases(),
        offline_tests:single_cases(),
        mam_tests:single_cases(),
-       mix_tests:single_cases(),
        carbons_tests:single_cases(),
        csi_tests:single_cases(),
        test_unregister]},
@@ -437,7 +436,6 @@ db_tests(DB) when DB == mnesia; DB == redis ->
      roster_tests:master_slave_cases(),
      offline_tests:master_slave_cases(),
      mam_tests:master_slave_cases(),
-     mix_tests:master_slave_cases(),
      vcard_tests:master_slave_cases(),
      announce_tests:master_slave_cases(),
      carbons_tests:master_slave_cases(),
@@ -458,7 +456,6 @@ db_tests(_) ->
        muc_tests:single_cases(),
        offline_tests:single_cases(),
        mam_tests:single_cases(),
-       mix_tests:single_cases(),
        test_unregister]},
      muc_tests:master_slave_cases(),
      privacy_tests:master_slave_cases(),
@@ -466,7 +463,6 @@ db_tests(_) ->
      roster_tests:master_slave_cases(),
      offline_tests:master_slave_cases(),
      mam_tests:master_slave_cases(),
-     mix_tests:master_slave_cases(),
      vcard_tests:master_slave_cases(),
      announce_tests:master_slave_cases(),
      carbons_tests:master_slave_cases()].
diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index 1db57ba44..3bfcfb235 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -36,7 +36,6 @@ host_config:
           - "flat"
           - "hometree"
           - "pep"
-      mod_mix: []
       mod_roster:
         versioning: true
         store_current_id: true
@@ -96,7 +95,6 @@ Welcome to this XMPP server."
           - "flat"
           - "hometree"
           - "pep"
-      mod_mix: []
       mod_roster:
         versioning: true
         store_current_id: true
@@ -161,7 +159,6 @@ Welcome to this XMPP server."
           - "flat"
           - "hometree"
           - "pep"
-      mod_mix: []
       mod_roster: 
         versioning: true
         store_current_id: true
@@ -217,7 +214,6 @@ Welcome to this XMPP server."
           - "flat"
           - "hometree"
           - "pep"
-      mod_mix: []
       mod_roster: 
         versioning: true
         store_current_id: true
@@ -278,7 +274,6 @@ Welcome to this XMPP server."
           - "flat"
           - "hometree"
           - "pep"
-      mod_mix: []
       mod_roster: 
         versioning: true
         store_current_id: true