diff options
| author | ellyjones@chromium.org <ellyjones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 18:20:23 +0000 |
|---|---|---|
| committer | ellyjones@chromium.org <ellyjones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 18:20:23 +0000 |
| commit | 99105db3c5d409aefc4f3d8f534e366d7402de3b (patch) | |
| tree | 8924670f6642301a9f1f52e937ddc562ffe58e37 | |
| parent | 43126b7196606e0a50ed637f84deace5d4fd64bb (diff) | |
| download | chromium_src-99105db3c5d409aefc4f3d8f534e366d7402de3b.zip chromium_src-99105db3c5d409aefc4f3d8f534e366d7402de3b.tar.gz chromium_src-99105db3c5d409aefc4f3d8f534e366d7402de3b.tar.bz2 | |
Disable QuickCheck and unit tests.
The current QuickCheck state machine is as follows:
Wait -> QC --ok--> FetchDHCP --fail--> FetchDNS --fail--> Fail
| | |
| --------ok--------------ok-------> Verify
|
|--fail--> Fail
What this means is that if QuickCheck fails, we will never try a DHCP fetch for
the WPAD script, even though that could still succeed as QuickCheck only tests
for the presence of a DNS source.
In future, the state machine should look like this:
Wait -> FetchDHCP --fail--> QC --ok--> FetchDNS --fail--> Fail
| | |
| | |--ok--> Verify
| |
| |--fail--> Fail
|
|--ok--> Verify
BUG=318730
TEST=unit,trybot
Review URL: https://codereview.chromium.org/65313004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235187 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/proxy/proxy_script_decider.cc | 2 | ||||
| -rw-r--r-- | net/proxy/proxy_script_decider_unittest.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/proxy/proxy_script_decider.cc b/net/proxy/proxy_script_decider.cc index f6316a0..3db33fc 100644 --- a/net/proxy/proxy_script_decider.cc +++ b/net/proxy/proxy_script_decider.cc @@ -240,7 +240,7 @@ int ProxyScriptDecider::DoWaitComplete(int result) { net_log_.EndEventWithNetErrorCode(NetLog::TYPE_PROXY_SCRIPT_DECIDER_WAIT, result); } - next_state_ = STATE_QUICK_CHECK; + next_state_ = GetStartState(); return OK; } diff --git a/net/proxy/proxy_script_decider_unittest.cc b/net/proxy/proxy_script_decider_unittest.cc index 61978ab..18d8c6f 100644 --- a/net/proxy/proxy_script_decider_unittest.cc +++ b/net/proxy/proxy_script_decider_unittest.cc @@ -288,6 +288,7 @@ class ProxyScriptDeciderQuickCheckTest : public ::testing::Test { ProxyConfig config_; }; +#if 0 // Fails if a synchronous DNS lookup success for wpad causes QuickCheck to fail. TEST_F(ProxyScriptDeciderQuickCheckTest, SyncSuccess) { resolver_.set_synchronous_mode(true); @@ -338,6 +339,7 @@ TEST_F(ProxyScriptDeciderQuickCheckTest, AsyncTimeout) { EXPECT_FALSE(resolver_.has_pending_requests()); EXPECT_FALSE(decider_->effective_config().has_pac_url()); } +#endif // Fails at WPAD (downloading), but succeeds in choosing the custom PAC. TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess1) { |