New issue
Advanced search Search tips
Note: Color blocks (like █ or █) mean that a user may not be available. Tooltip shows the reason.

Issue 652466 link

Starred by 1 user
Status: Verified
Owner: ----
Closed: Oct 2016
Cc:
dchan@chromium.org
█ krishna...@chromium.org
kathrelk...@chromium.org
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 2
Type: Feature



Sign in to add a comment

Move shared resources into common cros/enterprise directory

Project Member Reported by scunning...@chromium.org, Oct 3 2016 
Update EP Test framework and tests to use shared resources stored in the cros/enterprise directory.

Shared resources include:
- enterprise_base
- enterprise_policy_base
- enterprise_fake_dmserver.py
- src/MakeFile directory/file
- *.html test page files
- Other image (jpg) and text (pac) files

Comment 1 by scunning...@chromium.org, Oct 4 2016

Status: Started (was: Assigned)
CL https://chromium-review.googlesource.com/#/c/392351
Project Member

Comment 2 by bugdroid1@chromium.org, Oct 11 2016 

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/autotest/+/bad82c186e61393d0af34a5a814e105c93c0d782

commit bad82c186e61393d0af34a5a814e105c93c0d782
Author: Scott Cunningham <scunningham@chromium.org>
Date: Mon Oct 03 22:19:33 2016

Move shared resources into cros/enterprise directory.

Move all resources that are shared by two or more tests into a
common directory, located in cros/enterprise. To do this, the
changes changes are made:
1) Rename directory cros/policy to cros/enterprise.
2) Create an empty __init__.py file in the enterprise directory, so
AutoTest can find it.
3) Replace cros_policy_dir() method with class variable in
enterprise_policy_base.py. Update variable to point to
"cros/enterprise".
4) Replace all imports of enterprise_policy_base and
enterprise_fake_dmserver from 'autotest_lib.client.cros' with
'autotest_lib.client.cros.enterprise'.
5) Move all shared resources (*.html, *.swf, *.jpg, etc) into the
common directory (cros/enterprise).
6) Move _get_checkbox_properties() from policy_SearchSuggestEnable to
enterprise_policy_base.py. Rename _get_setting_checkbox_properties().
7) Remove cros/enterprise_base file, which is now obsolete.

Not covered here: replace same import as #4 in the ARC++ base class,
located at autotest-tests-cheets/client/common_lib/cros/
enterprise_cheets_base.py). See CL 294576.

BUG= chromium:652466 
TEST=None
CQ-DEPEND=CL:*294576

Change-Id: Ia75a6eb8932a6bc7c0b87caa5932aeab61142bee
Reviewed-on: https://chromium-review.googlesource.com/392351
Commit-Ready: Scott Cunningham <scunningham@chromium.org>
Tested-by: Scott Cunningham <scunningham@chromium.org>
Reviewed-by: Scott Cunningham <scunningham@chromium.org>

[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_CookiesAllowedForUrls/policy_CookiesAllowedForUrls.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_URLBlacklist/policy_URLBlacklist.py
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_CookiesAllowedForUrls/test_data/testWebsite1.html
[copy] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/website/website2.html
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/kittens.html
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/proxy_test.pac
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_URLWhitelist/test_data/website1.html
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_NotificationsAllowedForUrls/policy_NotificationsAllowedForUrls.py
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/website/website3.html
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/js_test.html
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/enterprise_policy_base.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_PluginsAllowedForUrls/policy_PluginsAllowedForUrls.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_JavaScriptBlockedForUrls/policy_JavaScriptBlockedForUrls.py
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_ImagesBlockedForUrls/kittens.jpg
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_ManagedBookmarks/policy_ManagedBookmarks.py
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/popup_status.html
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/kittens.jpg
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/plugin_status.html
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_JavaScriptBlockedForUrls/js_test.html
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_RestoreOnStartupURLs/policy_RestoreOnStartupURLs.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_ForceYouTubeSafetyMode/policy_ForceYouTubeSafetyMode.py
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/cookie_status.html
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_AutoFillEnabled/policy_AutoFillEnabled.py
[add] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/__init__.py
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_URLWhitelist/test_data/website3.html
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_ImagesBlockedForUrls/kittens.html
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_ImagesAllowedForUrls/policy_ImagesAllowedForUrls.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_JavaScriptAllowedForUrls/policy_JavaScriptAllowedForUrls.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_ProxySettings/policy_ProxySettings.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_ForceGoogleSafeSearch/policy_ForceGoogleSafeSearch.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_URLWhitelist/policy_URLWhitelist.py
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_URLBlacklist/test_data/website3.html
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_URLBlacklist/test_data/website2.html
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_PopupsAllowedForUrls/policy_PopupsAllowedForUrls.py
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_PopupsBlockedForUrls/popup_status.html
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_PluginsBlockedForUrls/policy_PluginsBlockedForUrls.py
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/notification_test_page.html
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_SearchSuggestEnabled/policy_SearchSuggestEnabled.py
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/cros/enterprise_base.py
[delete] https://crrev.com/afac42d2185e008e1a8625493de5e1cea99d5044/client/site_tests/policy_URLBlacklist/test_data/website1.html
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/plugin_flash.swf
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_CookiesBlockedForUrls/policy_CookiesBlockedForUrls.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_EditBookmarksEnabled/policy_EditBookmarksEnabled.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/enterprise_PowerManagement/enterprise_PowerManagement.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_ImagesBlockedForUrls/policy_ImagesBlockedForUrls.py
[rename] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/enterprise_fake_dmserver.py
[modify] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/site_tests/policy_PopupsBlockedForUrls/policy_PopupsBlockedForUrls.py
[copy] https://crrev.com/bad82c186e61393d0af34a5a814e105c93c0d782/client/cros/enterprise/website/website1.html

Comment 3 Deleted

Comment 4 by scunning...@chromium.org, Oct 17 2016

Labels: ent_autotests
Implemented all but src/MakeFile directory/file. That task is covered by  bug 629361 .

Comment 5 by scunning...@chromium.org, Nov 14 2016

Status: Verified (was: Fixed)
Tests working.

Comment 6 by scunning...@chromium.org, Mar 3 2017

Owner: ----
►

Sign in to add a comment