Commit ec708215 authored by Steven Bennetts's avatar Steven Bennetts Committed by Commit Bot

Test for shill::kErrorNoFailure in NetworkState

TBR=khormimoto@chromium.org

Bug: 931070
Change-Id: I820336ff5b53baff9c9dddf6dbb7373f9020339e
Reviewed-on: https://chromium-review.googlesource.com/c/1470746
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Auto-Submit: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632048}
parent 2de89c97
...@@ -540,8 +540,10 @@ bool NetworkState::NetworkStateIsCaptivePortal( ...@@ -540,8 +540,10 @@ bool NetworkState::NetworkStateIsCaptivePortal(
// static // static
bool NetworkState::ErrorIsValid(const std::string& error) { bool NetworkState::ErrorIsValid(const std::string& error) {
// Shill uses "Unknown" to indicate an unset or cleared error state. // Pre M-74 Shill uses "Unknown" to indicate an unset or cleared error state.
return !error.empty() && error != kErrorUnknown; // TODO(stevenjb): Remove kErrorUnknown once 74 has shipped.
return !error.empty() && error != kErrorUnknown &&
error != shill::kErrorNoFailure;
} }
// static // static
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment