diff options
| author | Garret Kelly <gdk@chromium.org> | 2015-03-12 16:20:55 -0400 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-03-27 01:34:11 +0000 |
| commit | d01b5cc35185e022b66e08832e12fe7f59b5aa24 (patch) | |
| tree | b2ac5b3b3dcc794c0e63780c5a6da606f04502a3 /mock_service.h | |
| parent | 78097469a1cd40b5b1874be4c977d4eb4d51e97f (diff) | |
| download | shill-d01b5cc35185e022b66e08832e12fe7f59b5aa24.tar.gz | |
shill: don't override static nameservers
When using the prepend_dns_servers flag, do not override nameservers if
they have been provided as part of the static configuration.
BUG=chrome-os-partner:37737
TEST=FEATURES=test emerge-amd64-generic shill
Change-Id: I1166052470931818f51074f26688b1a47847fd1a
Reviewed-on: https://chromium-review.googlesource.com/260504
Commit-Queue: Garret Kelly <gdk@chromium.org>
Tested-by: Garret Kelly <gdk@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Diffstat (limited to 'mock_service.h')
| -rw-r--r-- | mock_service.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mock_service.h b/mock_service.h index 2afae160..f71fcb6d 100644 --- a/mock_service.h +++ b/mock_service.h @@ -58,6 +58,7 @@ class MockService : public Service { MOCK_METHOD2(Configure, void(const KeyValueStore &args, Error *error)); MOCK_CONST_METHOD1(DoPropertiesMatch, bool(const KeyValueStore &args)); MOCK_CONST_METHOD0(Is8021xConnectable, bool()); + MOCK_CONST_METHOD0(HasStaticNameServers, bool()); MOCK_CONST_METHOD0(IsPortalDetectionDisabled, bool()); MOCK_CONST_METHOD0(IsPortalDetectionAuto, bool()); MOCK_CONST_METHOD0(IsRemembered, bool()); |