Skip to content

Commit 97e3bfd

Browse files
committed
Minor formatting cleanups
1 parent f686422 commit 97e3bfd

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

GNUmakefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ pylint:
9999
cd .. && pylint cpppo --disable=W,C,R
100100

101101

102-
build-check:
102+
build3-check:
103103
@$(PY3) -m build --version \
104104
|| ( echo "\n*** Missing Python modules; run:\n\n $(PY3) -m pip install --upgrade pip setuptools build\n" \
105105
&& false )
106106

107-
build3: build-check clean
107+
build3: build3-check clean
108108
$(PY3) -m build
109109
@ls -last dist
110110
build: build3
@@ -170,7 +170,6 @@ jessie64-%:
170170
fi
171171

172172

173-
174173
# Run only tests with a prefix containing the target string, eg test-blah
175174
test-%:
176175
$(PY_TEST) *$*_test.py

server/enip_test.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3872,7 +3872,6 @@ def enip_cli( number, tests=None, address=None ):
38723872

38733873
def enip_bench_basic():
38743874
with multiprocessing.Manager() as m:
3875-
38763875
enip_svr_kwds_basic = {
38773876
'enip_process': enip_process_canned,
38783877
'argv': [
@@ -3886,6 +3885,7 @@ def enip_bench_basic():
38863885
}),
38873886
},
38883887
}
3888+
38893889
failed = cpppo.server.network.bench(
38903890
server_func = enip_main,
38913891
server_kwds = enip_svr_kwds_basic,
@@ -3902,6 +3902,7 @@ def enip_bench_basic():
39023902

39033903
return failed
39043904

3905+
39053906
def test_enip_bench_basic():
39063907
assert not enip_bench_basic(), "One or more enip_bench_basic clients reported failure"
39073908

@@ -3952,7 +3953,7 @@ def enip_bench_logix():
39523953
'argv': [
39533954
'-a', 'localhost:0', '-A',
39543955
#'-v',
3955-
'SCADA=INT[1000]'
3956+
'SCADA=INT[1000]',
39563957
],
39573958
'server': {
39583959
'control': m.apidict( enip.timeout, {
@@ -3977,6 +3978,7 @@ def enip_bench_logix():
39773978

39783979
return failed
39793980

3981+
39803982
@pytest.mark.skipif( platform.system() == "Darwin" and sys.version_info[0] >= 3,
39813983
reason="No Python3 support for pickling Rlock on Mac" )
39823984
def test_enip_bench_logix():
@@ -4042,14 +4044,15 @@ def enip_bench_pylogix():
40424044
'argv': [
40434045
'-a', 'localhost:0', '-A',
40444046
#'-v',
4045-
'SCADA=INT[1000]'
4047+
'SCADA=INT[1000]',
40464048
],
40474049
'server': {
40484050
'control': m.apidict( enip.timeout, {
40494051
'done': False,
40504052
}),
40514053
},
40524054
}
4055+
40534056
failed = cpppo.server.network.bench(
40544057
server_func = enip_main,
40554058
server_kwds = enip_svr_kwds_pylogix,

0 commit comments

Comments
 (0)