Upstream Autotest merge.
As titled, a merge up to 93fc426ca133e775eb495f34d138fc57d92fb55e.
- Removes a bunch of deprecated code.
- Moves several private utilities into the private repo.
- Couple changes ported upstream and resynced.
BUG=None
TEST=In progress... will spin up new Autotest server and use
run_remote_tests for bvt, regression, smoke.
Change-Id: Id3e2ad529bb7b05f148e5d98aea46bb9ea828200
Reviewed-on: http://gerrit.chromium.org/gerrit/3350
Tested-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
diff --git a/frontend/afe/admin.py b/frontend/afe/admin.py
index b6ba64a..4c73837 100644
--- a/frontend/afe/admin.py
+++ b/frontend/afe/admin.py
@@ -57,7 +57,11 @@
class LabelAdmin(SiteAdmin):
- list_display = ('name', 'kernel_config')
+ list_display = ('name', 'atomic_group', 'kernel_config')
+ # Avoid a bug with the admin interface showing a select box pointed at an
+ # AtomicGroup when this field is intentionally NULL such that editing a
+ # label via the admin UI unintentionally sets an atomicgroup.
+ raw_id_fields = ('atomic_group',)
form = LabelForm