diff options
author | Cassidy Burden <cburden@google.com> | 2016-08-08 10:27:34 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2016-08-09 13:06:54 -0700 |
commit | a5e3929d7a155606bc541777fc84e4989389e13c (patch) | |
tree | e0f2e69f8714c76899c9c3281f0cded309457e1f /binary_search_tool/test | |
parent | d0b69bedbb9eb087ab231adbbe3af1ba26a945a3 (diff) | |
download | toolchain-utils-a5e3929d7a155606bc541777fc84e4989389e13c.tar.gz |
binary search tool: Rename install to test_setup
Refactor warning! Rename install script to be test_setup script.
TEST=Run unit tests
Change-Id: Iab7e01136fdcf2dedbfc94ece6ddb4b4fa3c0f68
Reviewed-on: https://chrome-internal-review.googlesource.com/273484
Commit-Ready: Cassidy Burden <cburden@google.com>
Tested-by: Cassidy Burden <cburden@google.com>
Reviewed-by: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'binary_search_tool/test')
-rwxr-xr-x | binary_search_tool/test/binary_search_tool_tester.py | 28 | ||||
-rwxr-xr-x | binary_search_tool/test/common.py | 2 | ||||
-rwxr-xr-x | binary_search_tool/test/is_good.py | 2 | ||||
-rwxr-xr-x | binary_search_tool/test/is_good_noinc_prune.py | 2 | ||||
-rwxr-xr-x | binary_search_tool/test/test_setup.py (renamed from binary_search_tool/test/install.py) | 6 | ||||
-rwxr-xr-x | binary_search_tool/test/test_setup_bad.py (renamed from binary_search_tool/test/install_bad.py) | 2 |
6 files changed, 20 insertions, 22 deletions
diff --git a/binary_search_tool/test/binary_search_tool_tester.py b/binary_search_tool/test/binary_search_tool_tester.py index 28e6afc8..12013d32 100755 --- a/binary_search_tool/test/binary_search_tool_tester.py +++ b/binary_search_tool/test/binary_search_tool_tester.py @@ -39,7 +39,7 @@ class BisectTest(unittest.TestCase): """Tests for bisect.py""" def setUp(self): - with open('./installed', 'w'): + with open('./is_setup', 'w'): pass try: @@ -49,7 +49,7 @@ class BisectTest(unittest.TestCase): def tearDown(self): try: - os.remove('./installed') + os.remove('./is_setup') os.remove(os.readlink(binary_search_state.STATE_FILE)) os.remove(binary_search_state.STATE_FILE) except OSError: @@ -110,7 +110,7 @@ class BisectingUtilsTest(unittest.TestCase): """Generate [100-1000] object files, and 1-5% of which are bad ones.""" GenObj() - with open('./installed', 'w'): + with open('./is_setup', 'w'): pass try: @@ -127,7 +127,7 @@ class BisectingUtilsTest(unittest.TestCase): except OSError: pass - cleanup_list = ['./installed', + cleanup_list = ['./is_setup', binary_search_state.STATE_FILE, 'noinc_prune_bad', 'noinc_prune_good'] @@ -153,8 +153,8 @@ class BisectingUtilsTest(unittest.TestCase): self.assertEquals(ret, 0) self.check_output() - def test_install_script(self): - os.remove('./installed') + def test_test_setup_script(self): + os.remove('./is_setup') with self.assertRaises(AssertionError): ret = binary_search_state.Run(get_initial_items='./gen_init_list.py', switch_to_good='./switch_to_good.py', @@ -167,19 +167,19 @@ class BisectingUtilsTest(unittest.TestCase): switch_to_good='./switch_to_good.py', switch_to_bad='./switch_to_bad.py', test_script='./is_good.py', - install_script='./install.py', + test_setup_script='./test_setup.py', prune=True, file_args=True) self.assertEquals(ret, 0) self.check_output() - def test_bad_install_script(self): + def test_bad_test_setup_script(self): with self.assertRaises(AssertionError): binary_search_state.Run(get_initial_items='./gen_init_list.py', switch_to_good='./switch_to_good.py', switch_to_bad='./switch_to_bad.py', test_script='./is_good.py', - install_script='./install_bad.py', + test_setup_script='./test_setup_bad.py', prune=True, file_args=True) @@ -281,7 +281,7 @@ class BisectingUtilsTest(unittest.TestCase): switch_to_good='./switch_to_good.py', switch_to_bad='./switch_to_bad.py', test_script='./is_good.py', - install_script='./install.py', + test_setup_script='./test_setup.py', prune=False, file_args=True) bss.DoSearch() @@ -308,7 +308,7 @@ class BisectingUtilsTest(unittest.TestCase): switch_to_good='./switch_to_good_noinc_prune.py', switch_to_bad='./switch_to_bad_noinc_prune.py', test_script='./is_good_noinc_prune.py', - install_script='./install.py', + test_setup_script='./test_setup.py', prune=True, noincremental=True, file_args=True, @@ -362,7 +362,7 @@ class BisectStressTest(unittest.TestCase): ret = binary_search_state.Run(get_initial_items='./gen_init_list.py', switch_to_good='./switch_to_good.py', switch_to_bad='./switch_to_bad.py', - install_script='./install.py', + test_setup_script='./test_setup.py', test_script='./is_good.py', prune=True, file_args=True) @@ -399,8 +399,8 @@ def Main(argv): for _ in range(0, num_tests): suite.addTest(BisectingUtilsTest()) suite.addTest(BisectingUtilsTest('test_arg_parse')) - suite.addTest(BisectingUtilsTest('test_install_script')) - suite.addTest(BisectingUtilsTest('test_bad_install_script')) + suite.addTest(BisectingUtilsTest('test_test_setup_script')) + suite.addTest(BisectingUtilsTest('test_bad_test_setup_script')) suite.addTest(BisectingUtilsTest('test_bad_save_state')) suite.addTest(BisectingUtilsTest('test_save_state')) suite.addTest(BisectingUtilsTest('test_load_state')) diff --git a/binary_search_tool/test/common.py b/binary_search_tool/test/common.py index 382274b9..baac9434 100755 --- a/binary_search_tool/test/common.py +++ b/binary_search_tool/test/common.py @@ -6,8 +6,6 @@ DEFAULT_BAD_OBJECT_NUMBER = 23 OBJECTS_FILE = 'objects.txt' WORKING_SET_FILE = 'working_set.txt' -installed = True - def ReadWorkingSet(): working_set = [] diff --git a/binary_search_tool/test/is_good.py b/binary_search_tool/test/is_good.py index f7cc8af7..bfe9cc32 100755 --- a/binary_search_tool/test/is_good.py +++ b/binary_search_tool/test/is_good.py @@ -10,7 +10,7 @@ import common def Main(): - if not os.path.exists('./installed'): + if not os.path.exists('./is_setup'): return 1 working_set = common.ReadWorkingSet() for w in working_set: diff --git a/binary_search_tool/test/is_good_noinc_prune.py b/binary_search_tool/test/is_good_noinc_prune.py index 9c37db32..5aafd6c2 100755 --- a/binary_search_tool/test/is_good_noinc_prune.py +++ b/binary_search_tool/test/is_good_noinc_prune.py @@ -33,7 +33,7 @@ def Main(): os.remove('noinc_prune_bad') os.remove('noinc_prune_good') - if not os.path.exists('./installed'): + if not os.path.exists('./is_setup'): return 1 for w in working_set: if w == 1: diff --git a/binary_search_tool/test/install.py b/binary_search_tool/test/test_setup.py index 5f721b92..3fb5a23c 100755 --- a/binary_search_tool/test/install.py +++ b/binary_search_tool/test/test_setup.py @@ -1,5 +1,5 @@ #!/usr/bin/python2 -"""Emulate installation of files, is_good.py should fail without this.""" +"""Emulate running of test setup script, is_good.py should fail without this.""" from __future__ import print_function @@ -7,8 +7,8 @@ import sys def Main(): - # create ./installed - with open('./installed', 'w'): + # create ./is_setup + with open('./is_setup', 'w'): pass return 0 diff --git a/binary_search_tool/test/install_bad.py b/binary_search_tool/test/test_setup_bad.py index 8b49a3f8..8d72763e 100755 --- a/binary_search_tool/test/install_bad.py +++ b/binary_search_tool/test/test_setup_bad.py @@ -1,5 +1,5 @@ #!/usr/bin/python2 -"""Emulate installation that fails (i.e. failed flash to device)""" +"""Emulate test setup that fails (i.e. failed flash to device)""" from __future__ import print_function |