Skip to content

Commit 0601399

Browse files
authored
Cleanup some test decorators. NFC (#24293)
1 parent e5f3e7f commit 0601399

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

test/common.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,7 @@ def metafunc(self, with_bigint, *args, **kwargs):
548548
self.set_setting('WASM_BIGINT')
549549
nodejs = self.require_node()
550550
self.node_args += shared.node_bigint_flags(nodejs)
551-
f(self, *args, **kwargs)
552-
else:
553-
f(self, *args, **kwargs)
551+
f(self, *args, **kwargs)
554552

555553
parameterize(metafunc, {'': (False,),
556554
'bigint': (True,)})
@@ -567,9 +565,7 @@ def metafunc(self, with_wasm64, *args, **kwargs):
567565
if with_wasm64:
568566
self.require_wasm64()
569567
self.set_setting('MEMORY64')
570-
f(self, *args, **kwargs)
571-
else:
572-
f(self, *args, **kwargs)
568+
f(self, *args, **kwargs)
573569

574570
parameterize(metafunc, {'': (False,),
575571
'wasm64': (True,)})
@@ -587,9 +583,7 @@ def metafunc(self, with_wasm2js, *args, **kwargs):
587583
if with_wasm2js:
588584
self.require_wasm2js()
589585
self.set_setting('WASM', 0)
590-
f(self, *args, **kwargs)
591-
else:
592-
f(self, *args, **kwargs)
586+
f(self, *args, **kwargs)
593587

594588
parameterize(metafunc, {'': (False,),
595589
'wasm2js': (True,)})
@@ -617,12 +611,10 @@ def can_do_standalone(self, impure=False):
617611
def also_with_standalone_wasm(impure=False):
618612
def decorated(func):
619613
@wraps(func)
620-
def metafunc(self, standalone):
614+
def metafunc(self, standalone, *args, **kwargs):
621615
if DEBUG:
622616
print('parameterize:standalone=%s' % standalone)
623-
if not standalone:
624-
func(self)
625-
else:
617+
if standalone:
626618
if not can_do_standalone(self, impure):
627619
self.skipTest('Test configuration is not compatible with STANDALONE_WASM')
628620
self.set_setting('STANDALONE_WASM')
@@ -638,7 +630,7 @@ def metafunc(self, standalone):
638630
self.wasm_engines = []
639631
nodejs = self.require_node()
640632
self.node_args += shared.node_bigint_flags(nodejs)
641-
func(self)
633+
func(self, *args, **kwargs)
642634

643635
parameterize(metafunc, {'': (False,),
644636
'standalone': (True,)})

0 commit comments

Comments
 (0)