Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
e89dbb2a
Commit
e89dbb2a
authored
6 years ago
by
Lang Martin
Browse files
Options
Download
Email Patches
Plain Diff
fix client-test, avoid hardwired platform dependecy on lo0
parent
a7fed726
Branches unavailable
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.4.0-rc.1
v1.4.0-beta.1
v1.3.8
v1.3.7
v1.3.6
v1.3.5
v1.3.4
v1.3.3
v1.3.2
v1.3.1
v1.3.0
v1.3.0-rc.1
v1.3.0-beta.1
v1.2.15
v1.2.14
v1.2.13
v1.2.12
v1.2.11
v1.2.10
v1.2.9
v1.2.8
v1.2.7
v1.2.6
v1.2.5
v1.2.4
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.2.0-rc1
v1.2.0-beta1
v1.1.18
v1.1.17
v1.1.16
v1.1.15
v1.1.14
v1.1.13
v1.1.12
v1.1.11
v1.1.10
v1.1.9
v1.1.8
v1.1.7
v1.1.6
v1.1.5
v1.1.4
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.1.0-rc1
v1.1.0-beta1
v1.0.18
v1.0.17
v1.0.16
v1.0.15
v1.0.14
v1.0.13
v1.0.12
v1.0.11
v1.0.10
v1.0.9
v1.0.8
v1.0.7
v1.0.6
v1.0.5
v1.0.4
v1.0.3
v1.0.2
v1.0.1
v1.0.0
v1.0.0-rc1
v1.0.0-beta3
v1.0.0-beta2
v0.12.12
v0.12.11
v0.12.10
v0.12.9
v0.12.8
v0.12.7
v0.12.6
v0.12.5
v0.12.4
v0.12.4-rc1
v0.12.3
v0.12.2
v0.12.1
v0.12.0
v0.12.0-rc1
v0.12.0-beta2
v0.12.0-beta1
v0.11.8
v0.11.7
v0.11.6
v0.11.5
v0.11.4
v0.11.3
v0.11.2
v0.11.1
v0.11.0
v0.11.0-rc1
v0.11.0-beta2
v0.11.0-beta1
v0.10.9
v0.10.8
v0.10.7
v0.10.6
v0.10.5
v0.10.4
v0.10.4-rc1
v0.10.3
v0.10.2
v0.10.2-rc1
v0.10.1
v0.10.0
v0.10.0-rc1
v0.10.0-connect1
v0.10.0-beta1
v0.9.7
v0.9.6
v0.9.5
v0.9.4
v0.9.4-rc1
v0.9.3
v0.9.2
v0.9.2-rc1
nightly
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
client/client_test.go
+2
-4
client/client_test.go
with
2 additions
and
4 deletions
+2
-4
client/client_test.go
+
2
-
4
View file @
e89dbb2a
...
...
@@ -1249,6 +1249,7 @@ func TestClient_UpdateNodeFromFingerprintKeepsConfig(t *testing.T) {
// Client without network configured updates to match fingerprint
client
,
cleanup
:=
TestClient
(
t
,
nil
)
defer
cleanup
()
dev
:=
client
.
config
.
Node
.
NodeResources
.
Networks
[
0
]
.
Device
client
.
updateNodeFromFingerprint
(
&
fingerprint
.
FingerprintResponse
{
NodeResources
:
&
structs
.
NodeResources
{
Cpu
:
structs
.
NodeCpuResources
{
CpuShares
:
123
},
...
...
@@ -1267,19 +1268,16 @@ func TestClient_UpdateNodeFromFingerprintKeepsConfig(t *testing.T) {
assert
.
Equal
(
t
,
"any-interface"
,
client
.
config
.
Node
.
Resources
.
Networks
[
0
]
.
Device
)
// Client with network configured keeps the config setting on update
dev
:=
"lo0"
name
:=
"TestClient_UpdateNodeFromFingerprintKeepsConfig2"
client
,
cleanup
=
TestClient
(
t
,
func
(
c
*
config
.
Config
)
{
c
.
NetworkInterface
=
dev
// Node is already a mock.Node, with a hardwired "eth0" device
c
.
Node
.
Name
=
name
// Node is already a mock.Node, with a device
c
.
Node
.
NodeResources
.
Networks
[
0
]
.
Device
=
dev
c
.
Node
.
Resources
.
Networks
=
c
.
Node
.
NodeResources
.
Networks
})
// REVIEW: are both defers going to run? should I just use different names?
defer
cleanup
()
assert
.
Equal
(
t
,
dev
,
client
.
config
.
NetworkInterface
)
assert
.
Equal
(
t
,
dev
,
client
.
config
.
Node
.
NodeResources
.
Networks
[
0
]
.
Device
)
client
.
updateNodeFromFingerprint
(
&
fingerprint
.
FingerprintResponse
{
NodeResources
:
&
structs
.
NodeResources
{
Cpu
:
structs
.
NodeCpuResources
{
CpuShares
:
123
},
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help