tests: fix 2 more, skip more related to elastic

Makefile

@@ -96,7 +96,7 @@ test-simple:
 # test-custom: Run tests without coverage, only run tests matching PATTERN
 test-custom:
 	PYTHONHASHSEED=random \
-	py.test -n auto $(if $(PATTERN),-k "$(PATTERN)",) -v -r xw -p no:sugar \
+	py.test $(if $(PATTERN),-k "$(PATTERN)",) -q -r f --tb=short -p no:sugar \
 	--ignore=rhodecode/tests/vcs_operations \
 	--ignore=rhodecode/tests/database
 
@@ -120,7 +120,30 @@ test-changed:
 # test-fast: Fastest possible test execution for development using pytest-xdist parallelism
 test-fast:
 	make test-clean
-	PYTHONHASHSEED=random PYTHONWARNINGS=ignore py.test -n auto -q -p no:sugar --tb=short \
+	PYTHONHASHSEED=0 PYTHONWARNINGS=ignore py.test -n 4 --maxfail=30 -q -p no:sugar --tb=short \
+	rhodecode/tests/functional \
+	rhodecode/tests/lib \
+	rhodecode/tests/models \
+	rhodecode/tests/other \
+	rhodecode/tests/events \
+	rhodecode/tests/integrations \
+	rhodecode/tests/config \
+	rhodecode/tests/vcs \
+	rhodecode/api/tests \
+	rhodecode/apps/admin/tests \
+	rhodecode/apps/gist/tests \
+	rhodecode/apps/home/tests \
+	rhodecode/apps/journal/tests \
+	rhodecode/apps/login/tests \
+	rhodecode/apps/my_account/tests \
+	rhodecode/apps/ops/tests \
+	rhodecode/apps/repo_group/tests \
+	rhodecode/apps/repository/tests \
+	rhodecode/apps/ssh_support/tests \
+	rhodecode/apps/svn_support/tests \
+	rhodecode/apps/user_group/tests \
+	rhodecode/apps/user_group_profile/tests \
+	rhodecode/apps/user_profile/tests \
 	--ignore=rhodecode/tests/vcs_operations \
 	--ignore=rhodecode/tests/database