Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
neoppod
Commits
7efe5d04
Commit
7efe5d04
authored
Aug 02, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! proto: Implement Error for NotPrimaryMaster
Provide details in the error message.
parent
43c19d59
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
2 deletions
+61
-2
go/neo/proto/proto-misc.go
go/neo/proto/proto-misc.go
+10
-2
go/neo/proto/proto-misc_test.go
go/neo/proto/proto-misc_test.go
+51
-0
No files found.
go/neo/proto/proto-misc.go
View file @
7efe5d04
// Copyright (C) 2017-202
1
Nexedi SA and Contributors.
// Copyright (C) 2017-202
3
Nexedi SA and Contributors.
// Kirill Smelkov <kirr@nexedi.com>
// Kirill Smelkov <kirr@nexedi.com>
//
//
// This program is free software: you can Use, Study, Modify and Redistribute
// This program is free software: you can Use, Study, Modify and Redistribute
...
@@ -57,7 +57,15 @@ func (e *Error) Error() string {
...
@@ -57,7 +57,15 @@ func (e *Error) Error() string {
func
(
n
*
NotPrimaryMaster
)
Error
()
string
{
func
(
n
*
NotPrimaryMaster
)
Error
()
string
{
return
"not primary master"
s
:=
"not primary master; primary: "
p
:=
int
(
n
.
Primary
)
if
0
<=
p
&&
p
<
len
(
n
.
KnownMasterList
)
{
s
+=
n
.
KnownMasterList
[
p
]
.
String
()
}
else
{
s
+=
"?"
}
s
+=
fmt
.
Sprintf
(
" ; known masters: %v"
,
n
.
KnownMasterList
)
return
s
}
}
...
...
go/neo/proto/proto-misc_test.go
0 → 100644
View file @
7efe5d04
// Copyright (C) 2023 Nexedi SA and Contributors.
// Kirill Smelkov <kirr@nexedi.com>
//
// This program is free software: you can Use, Study, Modify and Redistribute
// it under the terms of the GNU General Public License version 3, or (at your
// option) any later version, as published by the Free Software Foundation.
//
// You can also Link and Combine this program with other software covered by
// the terms of any of the Free Software licenses or any of the Open Source
// Initiative approved licenses and Convey the resulting work. Corresponding
// source of such a combination shall include the source code for all other
// software used.
//
// This program is distributed WITHOUT ANY WARRANTY; without even the implied
// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
//
// See COPYING file for full licensing terms.
// See https://www.nexedi.com/licensing for rationale and options.
package
proto
import
(
"testing"
)
func
TestNotPrimaryMasterError
(
t
*
testing
.
T
)
{
var
testv
=
[]
struct
{
msg
*
NotPrimaryMaster
estrok
string
}{
{
&
NotPrimaryMaster
{},
"not primary master; primary: ? ; known masters: []"
,
},
{
&
NotPrimaryMaster
{
1
,
nil
},
"not primary master; primary: ? ; known masters: []"
,
},
{
&
NotPrimaryMaster
{
1
,
[]
struct
{
Address
}{{
Address
{
"α"
,
111
}},
{
Address
{
"β"
,
222
}},
{
Address
{
"γ"
,
333
}}}},
"not primary master; primary: β:222 ; known masters: [α:111 β:222 γ:333]"
,
},
}
for
_
,
tt
:=
range
testv
{
estr
:=
tt
.
msg
.
Error
()
if
estr
!=
tt
.
estrok
{
t
.
Errorf
(
"%v: invalid error:
\n
have: %q
\n
want: %q"
,
tt
.
msg
,
estr
,
tt
.
estrok
)
}
}
}
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