Ekaterina's timeout option

Author: bereng

pytest.ini

@@ -1,10 +1,9 @@
 [pytest]
-addopts = --show-capture=stdout
+addopts = --show-capture=stdout --timeout=900
 python_files = test_*.py *_test.py *_tests.py
 junit_suite_name = Cassandra dtests
 log_level = INFO
 log_format = %(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s
-timeout = 1200
 markers =
     since
     vnodes