Skip to content

Commit da3f692

Browse files
committed
[tests] Only test submitter on linux because localfarm uses unix sockets
1 parent dac4f54 commit da3f692

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

tests/plugins/meshroom/pluginSubmitter/PluginSubmitter.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class PluginSubmitterA(desc.BaseNode):
1212
"""
1313
Test process no parallelization
1414
"""
15-
__test__ = False
1615
parallelization = None
1716

1817
inputs = [
@@ -43,7 +42,6 @@ class PluginSubmitterB(PluginSubmitterA):
4342
"""
4443
Test process with parallelization adn static node size
4544
"""
46-
__test__ = False
4745
size = desc.StaticNodeSize(2)
4846
parallelization = desc.Parallelization(blockSize=1)
4947

@@ -52,6 +50,5 @@ class PluginSubmitterC(PluginSubmitterA):
5250
"""
5351
Test process with parallelization and dynamic node size
5452
"""
55-
__test__ = False
5653
size = desc.DynamicNodeSize("input")
5754
parallelization = desc.Parallelization(blockSize=1)

tests/test_submit.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66

77
import os
88
import time
9+
from sys import platform
910

10-
from .utils import registerNodeDesc, unregisterNodeDesc
11+
from .utils import registerNodeDesc
1112

1213
import meshroom
14+
from meshroom.core import pluginManager, loadClassesNodes
1315
from meshroom.core.graph import Graph
16+
from meshroom.core.plugins import Plugin
1417
from meshroom.core.node import Node, Status
1518
from meshroom.core.submitter import jobManager
1619
from meshroom.submitters.localFarmSubmitter import LocalFarmSubmitter, LocalFarmJob
1720

1821
from localfarm.localFarmLauncher import FarmLauncher
1922

20-
from meshroom.core import pluginManager, loadClassesNodes
21-
from meshroom.core.graph import Graph
22-
from meshroom.core.plugins import Plugin
2323

24-
from .utils import registerNodeDesc
24+
IS_LINUX = (platform == "linux" or platform == "linux2")
2525

2626

2727
def get_submitter() -> LocalFarmSubmitter:
@@ -101,8 +101,7 @@ def processSubmit(node: Node, graph, tmp_path):
101101

102102

103103
class TestNodeSubmit:
104-
105-
logPrefix = r"\[\d{2}:\d{2}:\d{2}\.\d{3}\]\[info\] > "
104+
__test__ = IS_LINUX
106105

107106
@classmethod
108107
def setup_class(cls):

0 commit comments

Comments
 (0)