This is a small quick fix for this script when it doesn't find password, it should just exit, rather go through rest of the code.

Review URL: http://codereview.chromium.org/183022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24985 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/chrome/test/live_sync/sync_integration_test.py b/chrome/test/live_sync/sync_integration_test.py
index 5d15fc4..3f800b5 100644
--- a/chrome/test/live_sync/sync_integration_test.py
+++ b/chrome/test/live_sync/sync_integration_test.py
@@ -370,16 +370,20 @@ if '__main__' == __name__:
       '', '--sync-test-password', help='Password for the test account')

   options, args = option_parser.parse_args()

   if not options.sync_test_password:

-    if os.path.exists('sync_password'):

-      fs = open('sync_password', 'r')

+    password_file_path = os.path.join(

+        os.path.dirname(__file__),'sync_password')

+    if os.path.exists(password_file_path):

+      fs = open(password_file_path, 'r')

       lines = fs.readlines()

       if len(lines)==1:

         options.sync_test_password = lines[0].strip()

       else:

         sys.stderr.write('sync_password file is not in required format.\n')

+        sys.exit(1)

     else:

       sys.stderr.write(

           'Missing required parameter- sync_test_password, please fix it.\n')

+      sys.exit(1)

   if (not options.build_dir or not options.http_server_url or

       not options.http_server_port or not options.sync_test_username):

     sys.stderr.write('Missing required parameter, please fix it.\n')