Allow setting of user and device policies in functional tests

chrome/test/functional/chromeos_onc.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 import pyauto_functional  # must come before pyauto.
 import policy_base
 import pyauto
 
 
 class ChromeosONC(policy_base.PolicyTestBase):
   """
   Tests for Open Network Configuration (ONC).
 
   Open Network Configuration (ONC) files is a json dictionary
   that contains network configurations and is pulled via policies.
   These tests verify that ONC files that are formatted correctly
   add the network/certificate to the device.
   """
 
   ONC_PATH = os.path.join(pyauto.PyUITest.DataDir(), 'chromeos', 'cros')
 
   def setUp(self):
     policy_base.PolicyTestBase.setUp(self)
     self.CleanupFlimflamDirsOnChromeOS()
+    if self.IsChromeOS():

[Nirnimesh, 2012/04/05 19:05:30]

This file applies to chromeos only. This if is redundant.

[bartfab (slow), 2012/04/10 15:27:20]

Done.

+      self.LoginWithTestAccount()
 
   def _ReadONCFileAndSet(self, filename):
     """Reads the specified ONC file and sends it as a policy.
 
     Inputs:
       filename: The filename of the ONC file.  ONC files should
                 all be stored in the path defined by ONC_PATH.
     """
     with open(os.path.join(self.ONC_PATH, filename)) as fp:
-      self.SetPolicies({'OpenNetworkConfiguration': fp.read()})
+      self.SetUserPolicy({'OpenNetworkConfiguration': fp.read()})
 
   def _VerifyRememberedWifiNetworks(self, wifi_expect):
     """Verify the list of remembered networks contains those in wifi_expect.
 
     Inputs:
       wifi_expect: A dictionary of wifi networks where the key is the ssid
                       and the value is the encryption type of the network.
     """
     # Sometimes there is a race condition where upon restarting chrome
     # NetworkScan has not populated the network lists yet.  We should
@@ skipping 64 matching lines @@
         'ssid-none': '',
         'ssid-wpa': 'PSK'
     }
 
     self._ReadONCFileAndSet('network-multiple-unknown.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()