commit 92b2cff98317a9b176a0ecc1d88079418846059b
author Chris Masone <cmasone@chromium.org> Tue May 24 15:44:29 2011 -0700
committer Chris Masone <cmasone@chromium.org> Tue May 24 16:26:07 2011 -0700
tree 87cc5bcfa40479fc3f546dec8b6e964de4f55803
parent 9f3bba81906401d8d6ed13c77cf866c2a4d4b42a

[autotest] Force FQDN when trying to DNS-resolve www.google.com in CrosUITest setup

In the setup phase of CrosUITest, we fake out DNS by re-routing all
DNS resolution requests to a local DNS server.  We check that this has
been done by attempting a DNS resolution of 'www.google.com' and
expecting to get back 127.0.0.1.  By forcing the use of a
fully-qualified-domain-name, we make the resolution attempt go
directly to the DNS server, bypassing any local potential sources of
failure or hanging.

BUG=chromium-os:13384
TEST=suite_Smoke

Change-Id: I58f0f7175db6f0e2001fe164c5935ef7e5a18e4d
Reviewed-on: http://gerrit.chromium.org/gerrit/1495
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

client/cros/cros_ui_test.py

diff --git a/client/cros/cros_ui_test.py b/client/cros/cros_ui_test.py
index 5497547..1842b9e 100644
--- a/client/cros/cros_ui_test.py
+++ b/client/cros/cros_ui_test.py
@@ -95,7 +95,7 @@
                 logging.debug("Using local DNS for " + interface)
 
         utils.poll_for_condition(
-            lambda: self.__attempt_resolve('www.google.com', '127.0.0.1'),
+            lambda: self.__attempt_resolve('www.google.com.', '127.0.0.1'),
             login.TimeoutError('Timed out waiting for DNS changes.'),
             timeout=10)
 
@@ -117,7 +117,7 @@
                     logging.debug("No stored DNS for " + interface)
 
         utils.poll_for_condition(
-            lambda: self.__attempt_resolve('www.google.com',
+            lambda: self.__attempt_resolve('www.google.com.',
                                            '127.0.0.1',
                                            expected=False),
             login.TimeoutError('Timed out waiting to revert DNS.'),