Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
integration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
integration
Commits
92aea4b5
Commit
92aea4b5
authored
Feb 1, 2023
by
Josh Brooks
Browse files
Options
Downloads
Patches
Plain Diff
Fix race condition in channels integration test
parent
92e8644e
No related branches found
No related tags found
2 merge requests
!68
Master merge
,
!44
Feature/xx 4450/fix integration
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
basice2e/clients.goldoutput/client500.txt
+1
-0
1 addition, 0 deletions
basice2e/clients.goldoutput/client500.txt
basice2e/run.sh
+9
-3
9 additions, 3 deletions
basice2e/run.sh
with
10 additions
and
3 deletions
basice2e/clients.goldoutput/client500.txt
+
1
−
0
View file @
92aea4b5
New channel generated
New channel generated
Received 0/0 messages
Received 0/0 messages
Received 0/0 messages
Received 3/3 messages
Received 3/3 messages
Received from ChannelName this message: Hello, channel, this is 500
Received from ChannelName this message: Hello, channel, this is 500
Received from ChannelName this message: Hello, channel, this is 501
Received from ChannelName this message: Hello, channel, this is 501
...
...
This diff is collapsed.
Click to expand it.
basice2e/run.sh
+
9
−
3
View file @
92aea4b5
...
@@ -1249,12 +1249,18 @@ echo "Non-Ephemeral Test Complete."
...
@@ -1249,12 +1249,18 @@ echo "Non-Ephemeral Test Complete."
echo
"TESTING CHANNELS..."
echo
"TESTING CHANNELS..."
# Initialize creator of channel (will use default channel file path in CLI)
# Initialize creator of channel (will use default channel file path in CLI)
CLIENTCMD
=
"timeout 300s ../bin/client channels -s blob500
$CLIENTOPTS
-l
$CLIENTOUT
/client500.log --receiveCount
3
--channelPath
$CLIENTOUT
/channel500.chan --channelIdentityPath
$CLIENTOUT
/channel500.id --newChannel
--sendToChannel --message
\"
Hello, channel, this is 500
\"
"
CLIENTCMD
=
"timeout 300s ../bin/client channels -s blob500
$CLIENTOPTS
-l
$CLIENTOUT
/client500.log --receiveCount
0
--channelPath
$CLIENTOUT
/channel500.chan --channelIdentityPath
$CLIENTOUT
/channel500.id --newChannel"
eval
$CLIENTCMD
>
$CLIENTOUT
/client500.txt 2>&1 &
eval
$CLIENTCMD
>
$CLIENTOUT
/client500.txt 2>&1 &
PIDVAL
=
$!
PIDVAL
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL
"
echo
"
$CLIENTCMD
--
$PIDVAL
"
sleep
5
wait
$PIDVAL
# Have client which created channel send message to channel
CLIENTCMD
=
"timeout 300s ../bin/client channels -s blob500 -l
$CLIENTOUT
/client500.log
$CLIENTOPTS
--receiveCount 3 --channelPath
$CLIENTOUT
/channel500.chan --channelIdentityPath
$CLIENTOUT
/channel500.id --sendToChannel --message
\"
Hello, channel, this is 500
\"
"
eval
$CLIENTCMD
>>
$CLIENTOUT
/client500.txt 2>&1 &
PIDVAL1
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL1
"
# Initialize client which will join channel (will use default channel file path in CLI)
# Initialize client which will join channel (will use default channel file path in CLI)
CLIENTCMD
=
"timeout 300s ../bin/client channels -s blob501 -l
$CLIENTOUT
/client501.log
$CLIENTOPTS
--receiveCount 3 --channelPath
$CLIENTOUT
/channel500.chan --channelIdentityPath
$CLIENTOUT
/channel501.id --joinChannel --sendToChannel --message
\"
Hello, channel, this is 501
\"
"
CLIENTCMD
=
"timeout 300s ../bin/client channels -s blob501 -l
$CLIENTOUT
/client501.log
$CLIENTOPTS
--receiveCount 3 --channelPath
$CLIENTOUT
/channel500.chan --channelIdentityPath
$CLIENTOUT
/channel501.id --joinChannel --sendToChannel --message
\"
Hello, channel, this is 501
\"
"
...
@@ -1268,7 +1274,7 @@ eval $CLIENTCMD > $CLIENTOUT/client502.txt 2>&1 &
...
@@ -1268,7 +1274,7 @@ eval $CLIENTCMD > $CLIENTOUT/client502.txt 2>&1 &
PIDVAL3
=
$!
PIDVAL3
=
$!
echo
"
$CLIENTCMD
--
$PIDVAL3
"
echo
"
$CLIENTCMD
--
$PIDVAL3
"
wait
$PIDVAL
wait
$PIDVAL
1
wait
$PIDVAL2
wait
$PIDVAL2
wait
$PIDVAL3
wait
$PIDVAL3
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment