Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
03dc2c4e
Commit
03dc2c4e
authored
Sep 04, 2018
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(CI): minor fixes in tests
parent
065d5bf5
Pipeline
#2702
failed with stage
in 8 minutes 32 seconds
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
run_test_mbtcpmultimaster.sh
extensions/ModbusMaster/tests/run_test_mbtcpmultimaster.sh
+1
-1
test_mbtcpmaster.cc
extensions/ModbusMaster/tests/test_mbtcpmaster.cc
+2
-2
test_mbtcpmultimaster.cc
extensions/ModbusMaster/tests/test_mbtcpmultimaster.cc
+1
-1
test_passivetimer.cc
tests/test_passivetimer.cc
+2
-2
No files found.
extensions/ModbusMaster/tests/run_test_mbtcpmultimaster.sh
View file @
03dc2c4e
...
@@ -13,7 +13,7 @@ cd -
...
@@ -13,7 +13,7 @@ cd -
--smemory-id
SharedMemory
\
--smemory-id
SharedMemory
\
--mbtcp-filter-field
mb
\
--mbtcp-filter-field
mb
\
--mbtcp-filter-value
1
\
--mbtcp-filter-value
1
\
--mbtcp-polltime
50
--mbtcp-recv-timeout
500
--mbtcp-checktime
1000
--mbtcp-timeout
3000
--mbtcp-ignore-timeout
30
00
--dlog-add-levels
warn,crit
--mbtcp-polltime
50
--mbtcp-recv-timeout
500
--mbtcp-checktime
1000
--mbtcp-timeout
2500
--mbtcp-ignore-timeout
25
00
--dlog-add-levels
warn,crit
# --dlog-add-levels any
# --dlog-add-levels any
#--mbtcp-force-out 1
#--mbtcp-force-out 1
#--dlog-add-levels any
#--dlog-add-levels any
extensions/ModbusMaster/tests/test_mbtcpmaster.cc
View file @
03dc2c4e
...
@@ -174,13 +174,13 @@ TEST_CASE("MBTCPMaster: 0x01 (read coil status)", "[modbus][0x01][mbmaster][mbtc
...
@@ -174,13 +174,13 @@ TEST_CASE("MBTCPMaster: 0x01 (read coil status)", "[modbus][0x01][mbmaster][mbtc
CHECK
(
ui
->
isExist
(
mbID
)
);
CHECK
(
ui
->
isExist
(
mbID
)
);
mbs
->
setReply
(
65535
);
mbs
->
setReply
(
65535
);
msleep
(
polltime
+
2
0
0
);
msleep
(
polltime
+
2
5
0
);
REQUIRE
(
ui
->
getValue
(
1000
)
==
1
);
REQUIRE
(
ui
->
getValue
(
1000
)
==
1
);
REQUIRE
(
ui
->
getValue
(
1001
)
==
1
);
REQUIRE
(
ui
->
getValue
(
1001
)
==
1
);
REQUIRE
(
ui
->
getValue
(
1002
)
==
1
);
REQUIRE
(
ui
->
getValue
(
1002
)
==
1
);
mbs
->
setReply
(
0
);
mbs
->
setReply
(
0
);
msleep
(
polltime
+
2
0
0
);
msleep
(
polltime
+
2
5
0
);
REQUIRE
(
ui
->
getValue
(
1000
)
==
0
);
REQUIRE
(
ui
->
getValue
(
1000
)
==
0
);
REQUIRE
(
ui
->
getValue
(
1001
)
==
0
);
REQUIRE
(
ui
->
getValue
(
1001
)
==
0
);
REQUIRE
(
ui
->
getValue
(
1002
)
==
0
);
REQUIRE
(
ui
->
getValue
(
1002
)
==
0
);
...
...
extensions/ModbusMaster/tests/test_mbtcpmultimaster.cc
View file @
03dc2c4e
...
@@ -79,7 +79,7 @@ static void InitTest()
...
@@ -79,7 +79,7 @@ static void InitTest()
msleep
(
200
);
msleep
(
200
);
CHECK
(
mbs1
->
isRunning
()
);
CHECK
(
mbs1
->
isRunning
()
);
msleep
(
7
0
00
);
msleep
(
7
3
00
);
CHECK
(
ui
->
getValue
(
slaveNotRespond
)
==
0
);
CHECK
(
ui
->
getValue
(
slaveNotRespond
)
==
0
);
}
}
...
...
tests/test_passivetimer.cc
View file @
03dc2c4e
...
@@ -91,10 +91,10 @@ TEST_CASE("PassiveTimer: 1 msec", "[PassiveTimer][msec]" )
...
@@ -91,10 +91,10 @@ TEST_CASE("PassiveTimer: 1 msec", "[PassiveTimer][msec]" )
msleep
(
1
);
msleep
(
1
);
CHECK
(
pt
.
checkTime
()
);
CHECK
(
pt
.
checkTime
()
);
pt
.
setTiming
(
2
);
pt
.
setTiming
(
3
);
msleep
(
1
);
msleep
(
1
);
CHECK_FALSE
(
pt
.
checkTime
()
);
CHECK_FALSE
(
pt
.
checkTime
()
);
msleep
(
1
);
msleep
(
2
);
CHECK
(
pt
.
checkTime
()
);
CHECK
(
pt
.
checkTime
()
);
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment