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
5151dfd0
Commit
5151dfd0
authored
Mar 09, 2016
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(SM): подправил тест
parent
08e63472
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
tests.cc
extensions/SharedMemory/tests/tests.cc
+6
-5
tests.sh
extensions/SharedMemory/tests/tests.sh
+1
-1
No files found.
extensions/SharedMemory/tests/tests.cc
View file @
5151dfd0
...
...
@@ -47,6 +47,7 @@ int main(int argc, const char* argv[] )
act
->
add
(
shm
);
/*
ObjectId ns_id = conf->getControllerID("ReservSharedMemory");
if( ns_id == DefaultObjectId )
...
...
@@ -55,6 +56,9 @@ int main(int argc, const char* argv[] )
return 1;
}
auto nullsm = make_shared<NullSM>(ns_id, "reserv-sm-configure.xml");
act->add(nullsm);
*/
ObjectId
o_id
=
conf
->
getObjectID
(
"TestObject"
);
if
(
o_id
==
DefaultObjectId
)
...
...
@@ -68,9 +72,6 @@ int main(int argc, const char* argv[] )
obj
=
make_shared
<
TestObject
>
(
o_id
,
o_node
);
act
->
add
(
obj
);
auto
nullsm
=
make_shared
<
NullSM
>
(
ns_id
,
"reserv-sm-configure.xml"
);
act
->
add
(
nullsm
);
SystemMessage
sm
(
SystemMessage
::
StartUp
);
act
->
broadcast
(
sm
.
transport_msg
()
);
act
->
run
(
true
);
...
...
@@ -78,10 +79,10 @@ int main(int argc, const char* argv[] )
int
tout
=
6000
;
PassiveTimer
pt
(
tout
);
while
(
!
pt
.
checkTime
()
&&
!
act
->
exist
()
)
while
(
!
pt
.
checkTime
()
&&
!
shm
->
exist
()
)
msleep
(
100
);
if
(
!
act
->
exist
()
)
if
(
!
shm
->
exist
()
)
{
cerr
<<
"(tests): SharedMemory not exist! (timeout="
<<
tout
<<
")"
<<
endl
;
return
1
;
...
...
extensions/SharedMemory/tests/tests.sh
View file @
5151dfd0
...
...
@@ -8,6 +8,6 @@
./uniset2-start.sh
-f
./tests
$*
--
--confile
./sm-configure.xml
--pulsar-id
Pulsar_S
--pulsar-msec
1000
--e-filter
evnt_test
\
--heartbeat-node
localhost
--heartbeat-check-time
1000
--heartbeat-node
localhost
--heartbeat-check-time
1000
--TestObject-startup-timeout
0
#--sm-log-add-levels any --TestObject-log-add-levels any
#--dlog-add-levels any
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