Make integration test 2.4.x common

Author: gabor-boros

Makefile

@@ -50,12 +50,9 @@ test-integration:
 	pytest -v -m integration
 	@killall rethinkdb
 
-test-integration-2.4:
-	pytest -v -m integration_v2_4_x
-
 test-ci:
 	@rethinkdb&
-	pytest -v --cov rethinkdb --cov-report xml --ignore=tests/integration/test_write_hooks.py
+	pytest -v --cov rethinkdb --cov-report xml
 	@killall rethinkdb
 
 test-remote:

pytest.ini

@@ -3,7 +3,6 @@ python_files = test_*.py
 markers =
     unit: Run unit tests
     integration: Run integration tests
-    integration_v2_4_x: Run 2.4.x only integration tests
     trio: Run trio related tests
     tornado: Run tornado related tests
     asyncio: Run asyncio related tests

tests/integration/test_write_hooks.py

@@ -2,7 +2,7 @@
 
 from tests.helpers import IntegrationTestCaseBase
 
-@pytest.mark.integration_v2_4_x
+@pytest.mark.integration
 class TestWriteHooks(IntegrationTestCaseBase):
     def setup_method(self):
         super(TestWriteHooks, self).setup_method()