diff options
| author | stanleyw@chromium.org <stanleyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 00:57:42 +0000 |
|---|---|---|
| committer | stanleyw@chromium.org <stanleyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 00:57:42 +0000 |
| commit | dced049a39652f61abb4bdbe3adb697ba8c792cc (patch) | |
| tree | 0af4809b71298e337ef8f5b4fb5d64b352d9b501 /chrome | |
| parent | 3d50157e48f52a3da938bca980e936f254ecedc9 (diff) | |
| download | chromium_src-dced049a39652f61abb4bdbe3adb697ba8c792cc.zip chromium_src-dced049a39652f61abb4bdbe3adb697ba8c792cc.tar.gz chromium_src-dced049a39652f61abb4bdbe3adb697ba8c792cc.tar.bz2 | |
Fixing chromeos_onc test.
chromeos_onc tests rely on a clean profile. With shill now available,
we should delete shill profiles along with flimflam profiles. Note: stop/start
flimflam will work on stopping/starting shill as well.
BUG=chromium-os:32066
TEST=run chromeos_onc.py and make sure all tests pass.
Change-Id: Iab9513eb462e7c267506f7761105f28f2644ccf8
Review URL: https://chromiumcodereview.appspot.com/10683004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/functional/PYAUTO_TESTS | 3 | ||||
| -rwxr-xr-x | chrome/test/pyautolib/chromeos/suid_actions.py | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS index 33f60b8..6ee74a6 100644 --- a/chrome/test/functional/PYAUTO_TESTS +++ b/chrome/test/functional/PYAUTO_TESTS @@ -746,8 +746,7 @@ 'chromeos': [ 'chromeos_ephemeral', 'chromeos_device_policy', - # crosbug.com/32066 - # 'chromeos_onc', + 'chromeos_onc', 'policy', 'policy_prefs_ui', # crbug.com/115427 diff --git a/chrome/test/pyautolib/chromeos/suid_actions.py b/chrome/test/pyautolib/chromeos/suid_actions.py index d7dfe5f..9fe6679 100755 --- a/chrome/test/pyautolib/chromeos/suid_actions.py +++ b/chrome/test/pyautolib/chromeos/suid_actions.py @@ -48,14 +48,20 @@ class SuidAction(object): ## Actions ## def CleanFlimflamDirs(self): - """Clean the contents of all flimflam profiles. + """Clean the contents of all connection manager (shill/flimflam) profiles. TODO(stanleyw): crosbug.com/29421 This method restarts flimflam. It should - wait until flimflam is fully initialized and accessible via DBus. Otherwise, - there is a race conditions and subsequent accesses to flimflam may fail. + wait until flimflam/shill is fully initialized and accessible via DBus. + Otherwise, there is a race conditions and subsequent accesses to + flimflam/shill may fail. """ flimflam_dirs = ['/home/chronos/user/flimflam', - '/var/cache/flimflam'] + '/home/chronos/user/shill', + '/var/cache/flimflam', + '/var/cache/shill'] + + # The stop/start flimflam command should stop/start shill respectivly if + # enabled. os.system('stop flimflam') try: for flimflam_dir in flimflam_dirs: |