From faf9cfccd09d6f3a44129e289e9f42e195dc441b Mon Sep 17 00:00:00 2001
From: Yilei Yang <yileiyang@google.com>
Date: Wed, 21 Mar 2018 13:24:59 -0700
Subject: [PATCH] Remove the workaround for
 https://github.com/bazelbuild/bazel/issues/4001.

It has been fixed since bazel 0.10.0.

PiperOrigin-RevId: 189957103
---
 absl/testing/tests/absltest_test_helper.py | 26 +++++-----------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/absl/testing/tests/absltest_test_helper.py b/absl/testing/tests/absltest_test_helper.py
index 306e963a..83f1e6ab 100644
--- a/absl/testing/tests/absltest_test_helper.py
+++ b/absl/testing/tests/absltest_test_helper.py
@@ -47,43 +47,29 @@ def test_flags(self):
       self.assertTrue(os.access(FLAGS.test_tmpdir, os.W_OK))
     elif FLAGS.test_id == 2:
       self.assertEqual(FLAGS.test_random_seed, 321)
-      self._assert_directories_equal(
+      self.assertEqual(
           FLAGS.test_srcdir,
           os.environ['ABSLTEST_TEST_HELPER_EXPECTED_TEST_SRCDIR'])
-      self._assert_directories_equal(
+      self.assertEqual(
           FLAGS.test_tmpdir,
           os.environ['ABSLTEST_TEST_HELPER_EXPECTED_TEST_TMPDIR'])
     elif FLAGS.test_id == 3:
       self.assertEqual(FLAGS.test_random_seed, 123)
-      self._assert_directories_equal(
+      self.assertEqual(
           FLAGS.test_srcdir,
           os.environ['ABSLTEST_TEST_HELPER_EXPECTED_TEST_SRCDIR'])
-      self._assert_directories_equal(
+      self.assertEqual(
           FLAGS.test_tmpdir,
           os.environ['ABSLTEST_TEST_HELPER_EXPECTED_TEST_TMPDIR'])
     elif FLAGS.test_id == 4:
       self.assertEqual(FLAGS.test_random_seed, 221)
-      self._assert_directories_equal(
+      self.assertEqual(
           FLAGS.test_srcdir,
           os.environ['ABSLTEST_TEST_HELPER_EXPECTED_TEST_SRCDIR'])
-      self._assert_directories_equal(
+      self.assertEqual(
           FLAGS.test_tmpdir,
           os.environ['ABSLTEST_TEST_HELPER_EXPECTED_TEST_TMPDIR'])
 
-  def _assert_directories_equal(self, expected, actual):
-    if os.name == 'nt':
-      # Bazel on Windows has a bug where backslashes passed to subprocess are
-      # unnecessarily unescaped. This is the workaround before a new Bazel
-      # release that includes the fix is available.
-      # See https://github.com/bazelbuild/bazel/issues/4001.
-      if expected == actual:
-        return
-      if expected == actual.replace('\\', '\\\\'):
-        return
-      raise AssertionError('{} != {}', expected, actual)
-    else:
-      self.assertEqual(expected, actual)
-
   @unittest.expectedFailure
   def test_expected_failure(self):
     if FLAGS.test_id == 5: