Merge 'test_using_timestamp: update expected errors' from Benny Halevy

This mini-series updates the expected errors in `test/cql-pytest/test-timestamp.py`
to the ones changed in b7bbcdd.
Then, it renamed the test to `test_using_timestamp.py` so it would
run automatically with `test.py`.

Closes #14293

* github.com:scylladb/scylladb:
  cql-pytest: rename test-timestamp.py to test_using_timestamp.py
  cql-pytest: test-timestamp: test_key_writetime: update expected errors

test/cql-pytest/test-timestamp.py → test/cql-pytest/test_using_timestamp.py

@@ -86,7 +86,7 @@ def restrict_future_timestamp():
 # test will need to be replaced by a test for the new feature instead of
 # expecting an error message.
 def test_key_writetime(cql, table1):
-    with pytest.raises(InvalidRequest, match='PRIMARY KEY part k'):
+    with pytest.raises(InvalidRequest, match='PRIMARY KEY part k|WRITETIME is not legal on partition key component k'):
         cql.execute(f'SELECT writetime(k) FROM {table1}')
-    with pytest.raises(InvalidRequest, match='PRIMARY KEY part k'):
+    with pytest.raises(InvalidRequest, match='PRIMARY KEY part k|TTL is not legal on partition key component k'):
         cql.execute(f'SELECT ttl(k) FROM {table1}')