Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dfss
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mpcs
dfss
Commits
eb6b96df
Commit
eb6b96df
authored
Mar 02, 2016
by
Loïck Bonniot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[c] Fix tests
parent
c0710b02
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
17 deletions
+17
-17
dfssc/sign/starter.go
dfssc/sign/starter.go
+2
-2
tests/new_test.go
tests/new_test.go
+3
-3
tests/register_test.go
tests/register_test.go
+7
-7
tests/sign_test.go
tests/sign_test.go
+3
-3
tests/starters_test.go
tests/starters_test.go
+2
-2
No files found.
dfssc/sign/starter.go
View file @
eb6b96df
...
...
@@ -131,7 +131,7 @@ func (m *SignatureManager) addPeer(user *pAPI.User) (ready bool, err error) {
func
(
m
*
SignatureManager
)
SendReadySign
()
(
signatureUUID
string
,
err
error
)
{
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
10
*
time
.
Minute
)
defer
cancel
()
launch
,
err
:=
m
.
platform
.
ReadySign
(
ctx
,
&
api
.
ReadySignRequest
{
launch
,
err
:=
m
.
platform
.
ReadySign
(
ctx
,
&
pAPI
.
ReadySignRequest
{
ContractUuid
:
m
.
contract
.
UUID
,
})
if
err
!=
nil
{
...
...
@@ -139,7 +139,7 @@ func (m *SignatureManager) SendReadySign() (signatureUUID string, err error) {
}
errorCode
:=
launch
.
GetErrorCode
()
if
errorCode
.
Code
!=
api
.
ErrorCode_SUCCESS
{
if
errorCode
.
Code
!=
pAPI
.
ErrorCode_SUCCESS
{
err
=
errors
.
New
(
errorCode
.
Code
.
String
()
+
" "
+
errorCode
.
Message
)
return
}
...
...
tests/new_test.go
View file @
eb6b96df
...
...
@@ -41,7 +41,7 @@ func TestNewContract(t *testing.T) {
time
.
Sleep
(
2
*
time
.
Second
)
// Register client1
client1
,
err
:=
createClient
(
workingDir
,
ca
)
client1
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client1
,
"client1@example.com"
,
"password"
,
""
,
true
,
true
)
assert
.
Equal
(
t
,
nil
,
err
)
...
...
@@ -72,7 +72,7 @@ func TestNewContract(t *testing.T) {
assert
.
T
(
t
,
len
(
contract
.
Signers
[
1
]
.
Hash
)
==
0
)
// Register second signer
client2
,
err
:=
createClient
(
workingDir
,
ca
)
client2
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client2
,
"client2@example.com"
,
"password2"
,
""
,
true
,
true
)
assert
.
Equal
(
t
,
nil
,
err
)
...
...
@@ -119,7 +119,7 @@ func TestNewContract(t *testing.T) {
assert
.
NotEqual
(
t
,
nil
,
err
)
// Bad case: no authentication
client3
,
err
:=
createClient
(
workingDir
,
ca
)
client3
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
setLastArg
(
client3
,
"new"
,
false
)
client3
.
Stdin
=
strings
.
NewReader
(
"
\n
"
+
...
...
tests/register_test.go
View file @
eb6b96df
...
...
@@ -43,43 +43,43 @@ func TestRegisterAuth(t *testing.T) {
time
.
Sleep
(
2
*
time
.
Second
)
// Register client1
client1
,
err
:=
createClient
(
workingDir
,
ca
)
client1
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client1
,
"test@example.com"
,
"password"
,
""
,
true
,
true
)
assert
.
Equal
(
t
,
nil
,
err
)
// Register client2
client2
,
err
:=
createClient
(
workingDir
,
ca
)
client2
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client2
,
"test2@example.com"
,
""
,
"2048"
,
true
,
true
)
assert
.
Equal
(
t
,
nil
,
err
)
// Register client3
client3
,
err
:=
createClient
(
workingDir
,
ca
)
client3
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client3
,
"test@example.com"
,
""
,
""
,
true
,
true
)
assert
.
NotEqual
(
t
,
nil
,
err
)
// Register client4
client4
,
err
:=
createClient
(
workingDir
,
ca
)
client4
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client4
,
"test wrong mail"
,
""
,
""
,
true
,
true
)
assert
.
NotEqual
(
t
,
nil
,
err
)
// Register client5
client5
,
err
:=
createClient
(
workingDir
,
ca
)
client5
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client5
,
"wrong@key.fr"
,
""
,
"1024"
,
true
,
true
)
assert
.
NotEqual
(
t
,
nil
,
err
)
// Register client6
client6
,
err
:=
createClient
(
workingDir
,
ca
)
client6
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client6
,
"bad@auth.com"
,
""
,
""
,
false
,
true
)
assert
.
NotEqual
(
t
,
nil
,
err
)
// Register client7
client7
,
err
:=
createClient
(
workingDir
,
ca
)
client7
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client7
,
"bad@auth2.com"
,
""
,
""
,
true
,
false
)
assert
.
NotEqual
(
t
,
nil
,
err
)
...
...
tests/sign_test.go
View file @
eb6b96df
...
...
@@ -32,15 +32,15 @@ func TestSignContract(t *testing.T) {
// Register clients
clients
:=
make
([]
*
exec
.
Cmd
,
3
)
client1
,
err
:=
createClient
(
workingDir
,
ca
)
client1
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client1
,
"client1@example.com"
,
"password"
,
""
,
true
,
true
)
assert
.
Equal
(
t
,
nil
,
err
)
client2
,
err
:=
createClient
(
workingDir
,
ca
)
client2
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client2
,
"client2@example.com"
,
"password"
,
""
,
true
,
true
)
assert
.
Equal
(
t
,
nil
,
err
)
client3
,
err
:=
createClient
(
workingDir
,
ca
)
client3
,
err
:=
createClient
(
workingDir
,
ca
,
0
)
assert
.
Equal
(
t
,
nil
,
err
)
err
=
registerAndAuth
(
client3
,
"client3@example.com"
,
"password"
,
""
,
true
,
true
)
assert
.
Equal
(
t
,
nil
,
err
)
...
...
tests/starters_test.go
View file @
eb6b96df
...
...
@@ -50,7 +50,7 @@ func startPlatform(tmpDir string) (*exec.Cmd, []byte, error) {
// createClient creates a new working directory for a client, creating ca.pem.
// It returns a ready-to-run command, but you probably want to set the last argument of the command.
func
createClient
(
tmpDir
string
,
ca
[]
byte
)
(
*
exec
.
Cmd
,
error
)
{
func
createClient
(
tmpDir
string
,
ca
[]
byte
,
port
int
)
(
*
exec
.
Cmd
,
error
)
{
path
:=
filepath
.
Join
(
os
.
Getenv
(
"GOPATH"
),
"bin"
,
"dfssc"
)
// Create temporary directory for client
...
...
@@ -73,7 +73,7 @@ func createClient(tmpDir string, ca []byte) (*exec.Cmd, error) {
// Prepare the client command.
// The last argument is up to you!
cmd
:=
exec
.
Command
(
path
,
"-ca"
,
caPath
,
"-cert"
,
certPath
,
"-host"
,
"
localhost:"
+
testPort
,
"-key"
,
keyPath
,
"-v"
)
cmd
:=
exec
.
Command
(
path
,
"-ca"
,
caPath
,
"-cert"
,
certPath
,
"-host"
,
"
127.0.0.1:"
+
testPort
,
"-key"
,
keyPath
,
"-port"
,
strconv
.
Itoa
(
port
),
"-v"
)
return
cmd
,
nil
}
...
...
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