diff options
| -rw-r--r-- | absl/flags/tests/flags_test.py | 4 | ||||
| -rw-r--r-- | absl/testing/absltest.py | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/absl/flags/tests/flags_test.py b/absl/flags/tests/flags_test.py index 7dc578b..7bb7dca 100644 --- a/absl/flags/tests/flags_test.py +++ b/absl/flags/tests/flags_test.py @@ -626,7 +626,7 @@ class FlagsUnitTest(absltest.TestCase): '--stderrthreshold fatal', '--test1', '--test_random_seed 301', - '--test_randomize_ordering_seed None', + '--test_randomize_ordering_seed ', '--testcomma_list []', '--testget1', '--testget4 None', @@ -694,7 +694,7 @@ class FlagsUnitTest(absltest.TestCase): '--stderrthreshold fatal', '--test1', '--test_random_seed 301', - '--test_randomize_ordering_seed None', + '--test_randomize_ordering_seed ', '--testcomma_list []', '--testget1', '--testget4 None', diff --git a/absl/testing/absltest.py b/absl/testing/absltest.py index c65a034..39acba1 100644 --- a/absl/testing/absltest.py +++ b/absl/testing/absltest.py @@ -207,11 +207,8 @@ def _get_default_randomize_ordering_seed(): ValueError: Raised when the flag or env value is not one of the options above. """ - if FLAGS.test_randomize_ordering_seed is not None: - randomize = FLAGS.test_randomize_ordering_seed - else: - randomize = os.environ.get('TEST_RANDOMIZE_ORDERING_SEED') - if randomize is None: + randomize = FLAGS.test_randomize_ordering_seed + if not randomize: return 0 if randomize == 'random': return random.Random().randint(1, 4294967295) @@ -239,12 +236,14 @@ flags.DEFINE_string('test_srcdir', flags.DEFINE_string('test_tmpdir', get_default_test_tmpdir(), 'Directory for temporary testing files', allow_override_cpp=True) -flags.DEFINE_string('test_randomize_ordering_seed', None, +flags.DEFINE_string('test_randomize_ordering_seed', + os.environ.get('TEST_RANDOMIZE_ORDERING_SEED', ''), 'If positive, use this as a seed to randomize the ' 'execution order for test cases. If "random", pick a ' 'random seed to use. If 0 or not set, do not randomize ' 'test case execution order. This flag also overrides ' - 'the TEST_RANDOMIZE_ORDERING_SEED environment variable.') + 'the TEST_RANDOMIZE_ORDERING_SEED environment variable.', + allow_override_cpp=True) flags.DEFINE_string('xml_output_file', '', 'File to store XML test results') |