Put back the presence and s2s tests in the no_db section.

Tests are skipped anyway. This reverts ecce318304

test/ejabberd_SUITE.erl

@@ -368,6 +368,13 @@ no_db_tests() ->
        time,
        stats,
        disco]},
+     {presence_and_s2s, [sequence],
+      [test_auth_fail,
+       presence,
+       s2s_dialback,
+       s2s_optional,
+       s2s_required,
+       s2s_required_trusted]},
      auth_external,
      auth_external_no_jid,
      auth_external_no_user,
@@ -457,13 +464,6 @@ db_tests(DB) ->
        mam_tests:single_cases(),
        push_tests:single_cases(),
        test_unregister]},
-     {presence_and_s2s, [sequence],
-      [test_auth_fail,
-       presence,
-       s2s_dialback,
-       s2s_optional,
-       s2s_required,
-       s2s_required_trusted]},
      muc_tests:master_slave_cases(),
      privacy_tests:master_slave_cases(),
      pubsub_tests:master_slave_cases(),