Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Dunitrust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
nodes
rust
Dunitrust
Commits
68d169fd
Commit
68d169fd
authored
5 years ago
by
Éloïs
Browse files
Options
Downloads
Patches
Plain Diff
[tests] network-docs:url: tests shouldn't depend on addrs order
parent
6fed3aab
Branches
Branches containing commit
No related tags found
1 merge request
!217
Elois/fix
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Cargo.lock
+1
-0
1 addition, 0 deletions
Cargo.lock
lib/dunp/network-documents/Cargo.toml
+1
-0
1 addition, 0 deletions
lib/dunp/network-documents/Cargo.toml
lib/dunp/network-documents/src/url.rs
+28
-21
28 additions, 21 deletions
lib/dunp/network-documents/src/url.rs
with
30 additions
and
21 deletions
Cargo.lock
+
1
−
0
View file @
68d169fd
...
...
@@ -746,6 +746,7 @@ dependencies = [
"dubp-currency-params 0.2.0",
"dubp-user-docs 0.14.0",
"dup-crypto 0.7.0",
"durs-common-tests-tools 0.1.0",
"durs-common-tools 0.2.0",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
This diff is collapsed.
Click to expand it.
lib/dunp/network-documents/Cargo.toml
+
1
−
0
View file @
68d169fd
...
...
@@ -17,6 +17,7 @@ dubp-common-doc = { path = "../../dubp/common-doc" } #, version = "0.1.0" }
dubp-currency-params
=
{
path
=
"../../dubp/currency-params"
}
dubp-user-docs
=
{
path
=
"../../dubp/user-docs"
}
dup-crypto
=
{
path
=
"../../crypto"
}
durs-common-tests-tools
=
{
path
=
"../../tests-tools/common-tests-tools"
}
durs-common-tools
=
{
path
=
"../../tools/common-tools"
}
failure
=
"0.1.5"
hex
=
"0.3.*"
...
...
This diff is collapsed.
Click to expand it.
lib/dunp/network-documents/src/url.rs
+
28
−
21
View file @
68d169fd
...
...
@@ -228,15 +228,22 @@ mod tests {
assert_eq!
(
Ok
(
expected_url
.clone
()),
Url
::
from_str
(
"g1.duniter.org"
));
assert_eq!
(
vec!
[
/*use std::net::ToSocketAddrs;
let addrs: Vec<SocketAddr> = ("g1.duniter.org", 20901u16)
.to_socket_addrs()
.expect("fail to resolve g1.duniter.org")
.collect();
println!("{:?}", addrs);*/
assert!
(
durs_common_tests_tools
::
collections
::
slice_same_elems
(
&
vec!
[
SocketAddr
::
V4
(
SocketAddrV4
::
new
(
ip4
(),
80
)),
SocketAddr
::
V6
(
SocketAddrV6
::
new
(
ip6
(),
80
,
0
,
0
))
SocketAddr
::
V6
(
SocketAddrV6
::
new
(
ip6
(),
80
,
0
,
0
))
,
],
expected_url
&
expected_url
.to_listenable_addr
(
"ws"
)
.expect
(
"Fail to get to_listenable_addr addr"
)
);
.expect
(
"Fail to get to_listenable_addr addr"
)
,
)
);
Ok
(())
}
...
...
@@ -245,14 +252,14 @@ mod tests {
fn
parse_url_with_scheme_and_host
()
->
Result
<
(),
url
::
ParseError
>
{
let
url
=
Url
::
Url
(
url
::
Url
::
parse
(
"wss://g1.duniter.org"
)
?
);
assert_eq!
(
vec!
[
assert!
(
durs_common_tests_tools
::
collections
::
slice_same_elems
(
&
vec!
[
SocketAddr
::
V6
(
SocketAddrV6
::
new
(
ip6
(),
443
,
0
,
0
)),
SocketAddr
::
V4
(
SocketAddrV4
::
new
(
ip4
(),
443
)),
SocketAddr
::
V6
(
SocketAddrV6
::
new
(
ip6
(),
443
,
0
,
0
))
],
url
.to_listenable_addr
(
"ws"
)
&
url
.to_listenable_addr
(
"ws"
)
.expect
(
"Fail to get to_listenable_addr addr"
)
);
)
);
Ok
(())
}
...
...
@@ -272,15 +279,15 @@ mod tests {
Url
::
from_str
(
"g1.duniter.org:20901"
)
);
assert_eq!
(
vec!
[
assert!
(
durs_common_tests_tools
::
collections
::
slice_same_elems
(
&
vec!
[
SocketAddr
::
V6
(
SocketAddrV6
::
new
(
ip6
(),
20901
,
0
,
0
)),
SocketAddr
::
V4
(
SocketAddrV4
::
new
(
ip4
(),
20901
)),
SocketAddr
::
V6
(
SocketAddrV6
::
new
(
ip6
(),
20901
,
0
,
0
))
],
expected_url
&
expected_url
.to_listenable_addr
(
"ws"
)
.expect
(
"Fail to get to_listenable_addr addr"
)
);
)
);
Ok
(())
}
...
...
@@ -289,14 +296,14 @@ mod tests {
fn
parse_url_with_scheme_and_host_and_port
()
->
Result
<
(),
url
::
ParseError
>
{
let
url
=
Url
::
Url
(
url
::
Url
::
parse
(
"ws://g1.duniter.org:20901"
)
?
);
assert_eq!
(
vec!
[
assert!
(
durs_common_tests_tools
::
collections
::
slice_same_elems
(
&
vec!
[
SocketAddr
::
V6
(
SocketAddrV6
::
new
(
ip6
(),
20901
,
0
,
0
)),
SocketAddr
::
V4
(
SocketAddrV4
::
new
(
ip4
(),
20901
)),
SocketAddr
::
V6
(
SocketAddrV6
::
new
(
ip6
(),
20901
,
0
,
0
))
],
url
.to_listenable_addr
(
"ws"
)
&
url
.to_listenable_addr
(
"ws"
)
.expect
(
"Fail to get to_listenable_addr addr"
)
);
)
);
Ok
(())
}
...
...
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