diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-12 02:05:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-12 02:05:46 +0000 |
| commit | 56989a112365b91e58a9e61ef72d1c6b0b2f38a7 (patch) | |
| tree | 028e97d3abb9dd993af3b88b66d0786fe11b3c3e | |
| parent | b5bb82a2526705036b9879aa58e95dee8ae0b009 (diff) | |
| parent | 409ca906021699fc6ad0d54e445376a23391491f (diff) | |
| download | tests-56989a112365b91e58a9e61ef72d1c6b0b2f38a7.tar.gz | |
Snap for 6484129 from 409ca906021699fc6ad0d54e445376a23391491f to rvc-d1-release
Change-Id: I55ba6852014613391bf7e6481c75dcea843cd1e4
| -rw-r--r-- | METADATA | 3 | ||||
| -rwxr-xr-x | net/test/all_tests.py | 8 | ||||
| -rwxr-xr-x | net/test/net_test.sh | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/net/test/all_tests.py b/net/test/all_tests.py index 38c4eac..5f6c583 100755 --- a/net/test/all_tests.py +++ b/net/test/all_tests.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from importlib import import_module +import importlib import sys import unittest @@ -49,8 +49,8 @@ if __name__ == '__main__': # First, run InjectTests on all modules, to ensure that any parameterized # tests in those modules are injected. for name in test_modules: - import_module(name) - if hasattr(sys.modules[name], "InjectTests"): + importlib.import_module(name) + if hasattr(sys.modules[name], 'InjectTests'): sys.modules[name].InjectTests() loader = unittest.defaultTestLoader @@ -60,7 +60,7 @@ if __name__ == '__main__': test_suite = loader.loadTestsFromNames(test_modules) assert test_suite.countTestCases() > 0, ( - "Inconceivable: no tests found! Command line: %s" % " ".join(sys.argv)) + 'Inconceivable: no tests found! Command line: %s' % ' '.join(sys.argv)) runner = unittest.TextTestRunner(verbosity=2) result = runner.run(test_suite) diff --git a/net/test/net_test.sh b/net/test/net_test.sh index 9b9773e..6a22c0e 100755 --- a/net/test/net_test.sh +++ b/net/test/net_test.sh @@ -149,7 +149,7 @@ ip link set lo mtu 16436 ip link set eth0 up # Allow people to run ping. -echo "0 65536" > /proc/sys/net/ipv4/ping_group_range +echo '0 2147483647' > /proc/sys/net/ipv4/ping_group_range # Read environment variables passed to the kernel to determine if script is # running on builder and to find which test to run. |