Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Side by Side Diff: trunk/src/build/android/pylib/fake_dns.py

Issue 23926012: Revert 221736 "[android] Adds constants.GetOutDirectory() and co..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import android_commands 5 import android_commands
6 import constants 6 import constants
7 import logging 7 import logging
8 import os 8 import os
9 import subprocess 9 import subprocess
10 import time 10 import time
(...skipping 12 matching lines...) Expand all
23 self._fake_dns = None 23 self._fake_dns = None
24 self._original_dns = None 24 self._original_dns = None
25 25
26 def _PushAndStartFakeDns(self): 26 def _PushAndStartFakeDns(self):
27 """Starts the fake_dns server that replies all name queries 127.0.0.1. 27 """Starts the fake_dns server that replies all name queries 127.0.0.1.
28 28
29 Returns: 29 Returns:
30 subprocess instance connected to the fake_dns process on the device. 30 subprocess instance connected to the fake_dns process on the device.
31 """ 31 """
32 self._adb.PushIfNeeded( 32 self._adb.PushIfNeeded(
33 os.path.join(constants.GetOutDirectory(), 'fake_dns'), 33 os.path.join(constants.DIR_SOURCE_ROOT, 'out', constants.GetBuildType(),
34 'fake_dns'),
34 FakeDns._FAKE_DNS_PATH) 35 FakeDns._FAKE_DNS_PATH)
35 return subprocess.Popen( 36 return subprocess.Popen(
36 ['adb', '-s', self._adb._adb.GetSerialNumber(), 37 ['adb', '-s', self._adb._adb.GetSerialNumber(),
37 'shell', '%s -D' % FakeDns._FAKE_DNS_PATH]) 38 'shell', '%s -D' % FakeDns._FAKE_DNS_PATH])
38 39
39 def SetUp(self): 40 def SetUp(self):
40 """Configures the system to point to a DNS server that replies 127.0.0.1. 41 """Configures the system to point to a DNS server that replies 127.0.0.1.
41 42
42 This can be used in combination with the forwarder to forward all web 43 This can be used in combination with the forwarder to forward all web
43 traffic to a replay server. 44 traffic to a replay server.
44 45
45 The TearDown() method will perform all cleanup. 46 The TearDown() method will perform all cleanup.
46 """ 47 """
47 self._adb.RunShellCommand('ip route add 8.8.8.0/24 via 127.0.0.1 dev lo') 48 self._adb.RunShellCommand('ip route add 8.8.8.0/24 via 127.0.0.1 dev lo')
48 self._fake_dns = self._PushAndStartFakeDns() 49 self._fake_dns = self._PushAndStartFakeDns()
49 self._original_dns = self._adb.RunShellCommand('getprop net.dns1')[0] 50 self._original_dns = self._adb.RunShellCommand('getprop net.dns1')[0]
50 self._adb.RunShellCommand('setprop net.dns1 127.0.0.1') 51 self._adb.RunShellCommand('setprop net.dns1 127.0.0.1')
51 time.sleep(2) # Time for server to start and the setprop to take effect. 52 time.sleep(2) # Time for server to start and the setprop to take effect.
52 53
53 def TearDown(self): 54 def TearDown(self):
54 """Shuts down the fake_dns.""" 55 """Shuts down the fake_dns."""
55 if self._fake_dns: 56 if self._fake_dns:
56 if not self._original_dns or self._original_dns == '127.0.0.1': 57 if not self._original_dns or self._original_dns == '127.0.0.1':
57 logging.warning('Bad original DNS, falling back to Google DNS.') 58 logging.warning('Bad original DNS, falling back to Google DNS.')
58 self._original_dns = '8.8.8.8' 59 self._original_dns = '8.8.8.8'
59 self._adb.RunShellCommand('setprop net.dns1 %s' % self._original_dns) 60 self._adb.RunShellCommand('setprop net.dns1 %s' % self._original_dns)
60 self._fake_dns.kill() 61 self._fake_dns.kill()
61 self._adb.RunShellCommand('ip route del 8.8.8.0/24 via 127.0.0.1 dev lo') 62 self._adb.RunShellCommand('ip route del 8.8.8.0/24 via 127.0.0.1 dev lo')
OLDNEW
« no previous file with comments | « trunk/src/build/android/pylib/device_stats_monitor.py ('k') | trunk/src/build/android/pylib/forwarder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698