Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
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
Container Registry
Model registry
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
17e3eea6
Unverified
Commit
17e3eea6
authored
6 years ago
by
teor
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
parents
5d41e222
cc23afdd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/bug29530_035
+5
-0
5 additions, 0 deletions
changes/bug29530_035
src/test/test_address.c
+3
-3
3 additions, 3 deletions
src/test/test_address.c
with
8 additions
and
3 deletions
changes/bug29530_035
0 → 100644
+
5
−
0
View file @
17e3eea6
o Minor bugfixes (testing):
- Downgrade some LOG_ERR messages in the address/* tests to warnings.
The LOG_ERR messages were occurring when we had no configured network.
We were failing the unit tests, because we backported 28668 to 0.3.5.8,
but did not backport 29530. Fixes bug 29530; bugfix on 0.3.5.8.
This diff is collapsed.
Click to expand it.
src/test/test_address.c
+
3
−
3
View file @
17e3eea6
...
...
@@ -744,7 +744,7 @@ test_address_get_if_addrs_list_internal(void *arg)
(
void
)
arg
;
results
=
get_interface_address_list
(
LOG_
ERR
,
1
);
results
=
get_interface_address_list
(
LOG_
WARN
,
1
);
tt_ptr_op
(
results
,
OP_NE
,
NULL
);
/* When the network is down, a system might not have any non-local
...
...
@@ -775,7 +775,7 @@ test_address_get_if_addrs_list_no_internal(void *arg)
(
void
)
arg
;
results
=
get_interface_address_list
(
LOG_
ERR
,
0
);
results
=
get_interface_address_list
(
LOG_
WARN
,
0
);
tt_ptr_op
(
results
,
OP_NE
,
NULL
);
/* Work even on systems with only internal IPv4 addresses */
...
...
@@ -986,7 +986,7 @@ test_address_get_if_addrs(void *arg)
(
void
)
arg
;
rv
=
get_interface_address
(
LOG_
ERR
,
&
addr_h
);
rv
=
get_interface_address
(
LOG_
WARN
,
&
addr_h
);
/* When the network is down, a system might not have any non-local
* non-multicast IPv4 addresses, not even internal ones.
...
...
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