client/site_tests/factory_Wipe/factory_Wipe.py - Issue 3362018: Kill factory partition dead.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/site_tests/factory_Wipe/factory_Wipe.py

Issue 3362018: Kill factory partition dead. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git

Patch Set: . Created 10 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: client/site_tests/factory_Wipe/factory_Wipe.py

diff --git a/client/site_tests/factory_Wipe/factory_Wipe.py b/client/site_tests/factory_Wipe/factory_Wipe.py

index d4a6c71daef9818b76dd28cf8311c12468ecffad..904b0ae8c10468f4932341b4d80011d958538681 100644

--- a/client/site_tests/factory_Wipe/factory_Wipe.py

+++ b/client/site_tests/factory_Wipe/factory_Wipe.py

@@ -19,8 +19,11 @@ class factory_Wipe(test.test):

factory.log('switch to boot from release image and prepare wipe')

+ # Switch to the release image.

+ utils.run('./switch_partitions.sh')

# Tag the current image to be wiped according to preference

- # (secure or fast).

+ # (secure or fast). Don't tag until partition switch passes.

tag_filename = '/mnt/stateful_partition/factory_install_reset'

if secure_wipe:

utils.run('touch %s' % tag_filename)

@@ -29,8 +32,6 @@ class factory_Wipe(test.test):

# Copy the wipe splash image to state partition.

utils.run('cp -f wipe_splash.png /mnt/stateful_partition/')

- # Switch to the release image.

- utils.run('./switch_partitions.sh')

# Time for reboot.

utils.run('shutdown -r now')