network_ShillInitScripts: stop caring about .disable_shill
This has been dead since the flimflam switch in 2012:
https://gerrit.chromium.org/gerrit/33895
But we started failing this test since this:
https://chromium-review.googlesource.com/1416751
BUG=chromium:934410
TEST=run the test
Change-Id: Ia26ccf9741b0727318109a9569ad50e37af6f73d
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1480676
Commit-Ready: Ben Chan <benchan@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
diff --git a/client/site_tests/network_ShillInitScripts/network_ShillInitScripts.py b/client/site_tests/network_ShillInitScripts/network_ShillInitScripts.py
index fce0305..c432fb6 100644
--- a/client/site_tests/network_ShillInitScripts/network_ShillInitScripts.py
+++ b/client/site_tests/network_ShillInitScripts/network_ShillInitScripts.py
@@ -25,7 +25,7 @@
'/run/state/logged-in',
'/run/dhcpcd',
'/var/lib/dhcpcd',
- '/home/chronos/.disable_shill' ]
+ ]
fake_user = 'not-a-real-user@chromium.org'
saved_config = '/tmp/network_ShillInitScripts_saved_config.tgz'
cryptohome_path_command = 'cryptohome-path'
@@ -409,7 +409,6 @@
Also ensure the push argument is not provided by default.
"""
- self.touch('/home/chronos/.disable_shill')
self.start_shill()
self.assure_is_dir('/run/shill', 'Shill run directory')
self.assure_is_dir('/var/lib/dhcpcd', 'dhcpcd lib directory')
@@ -418,8 +417,6 @@
self.assure_is_dir('/run/dhcpcd', 'dhcpcd run directory')
self.assure_path_owner('/run/dhcpcd', 'dhcp')
self.assure_path_group('/run/dhcpcd', 'dhcp')
- self.assure(not os.path.exists('/home/chronos/.disable_shill'),
- 'Shill disable file does not exist')
self.assure('--push=~chronos/shill' not in self.get_commandline(),
'Shill command line does not contain push argument')
