[PATCH] Revert "test: Use linux-aio backend again on seastar-based tests"

[Raphael S. Carvalho]

This reverts commit ce651643150867ec2d1c80f3a37d2126acdcd93b.

Signed-off-by: Raphael S. Carvalho <raph...@scylladb.com>
---
test.py | 10 +++-------
test/boost/suite.yaml | 2 --
test/raft/suite.yaml | 2 --
3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/test.py b/test.py
index 2fdba11d04..46d88b4a73 100755
--- a/test.py
+++ b/test.py
@@ -316,7 +316,6 @@ class UnitTestSuite(TestSuite):
super().__init__(path, cfg, options, mode)
# Map of custom test command line arguments, if configured
self.custom_args = cfg.get("custom_args", {})
- self.extra_cmdline_options = cfg.get("extra_scylla_cmdline_options", [])
# Map of tests that cannot run with compaction groups
self.all_can_run_compaction_groups_except = cfg.get("all_can_run_compaction_groups_except")

@@ -328,10 +327,6 @@ class UnitTestSuite(TestSuite):
test = UnitTest(self.next_id((shortname, self.suite_key)), shortname, suite, args)
self.tests.append(test)

- def prepare_arg(self, arg):
- extra_cmdline_options = ' '.join(self.extra_cmdline_options)
- return f'{arg} {extra_cmdline_options}'
-
async def add_test(self, shortname, casename) -> None:
"""Create a UnitTest class with possibly custom command line
arguments and add it to the list of tests"""
@@ -344,7 +339,7 @@ class UnitTestSuite(TestSuite):
args = self.custom_args.get(shortname, ["-c2 -m2G"])
args = merge_cmdline_options(args, self.options.extra_scylla_cmdline_options)
for a in args:
- await self.create_test(shortname, casename, self, self.prepare_arg(a))
+ await self.create_test(shortname, casename, self, a)

@property
def pattern(self) -> str:
@@ -462,12 +457,13 @@ class BoostTestSuite(UnitTestSuite):
# Skip tests which are not configured, and hence are not built
if os.path.join("test", self.name, execname if combined_test else shortname) not in self.options.tests:
return
+
# Default seastar arguments, if not provided in custom test options,
# are two cores and 2G of RAM
args = self.custom_args.get(shortname, ["-c2 -m2G"])
args = merge_cmdline_options(args, self.options.extra_scylla_cmdline_options)
for a in args:
- await self.create_test(shortname, casename, self, self.prepare_arg(a))
+ await self.create_test(shortname, casename, self, a)

def junit_tests(self) -> Iterable['Test']:
"""Boost tests produce an own XML output, so are not included in a junit report"""
diff --git a/test/boost/suite.yaml b/test/boost/suite.yaml
index 5b7ea487a0..ac117a5651 100644
--- a/test/boost/suite.yaml
+++ b/test/boost/suite.yaml
@@ -1,6 +1,4 @@
type: boost
-extra_scylla_cmdline_options:
- - '--reactor-backend linux-aio'
# A list of long tests, which should be started early
run_first:
- index_with_paging_test
diff --git a/test/raft/suite.yaml b/test/raft/suite.yaml
index 46076f768e..76292b1fb7 100644
--- a/test/raft/suite.yaml
+++ b/test/raft/suite.yaml
@@ -1,3 +1 @@
type: boost
-extra_scylla_cmdline_options:
- - '--reactor-backend linux-aio'
--
2.48.1

[Raphael S. Carvalho]

Please ignore this patch, I was just testing my git-send-mail again.