Title: [100216] trunk/Tools
Revision
100216
Author
[email protected]
Date
2011-11-14 16:47:18 -0800 (Mon, 14 Nov 2011)

Log Message

Unreviewed, rolling out r100192.
http://trac.webkit.org/changeset/100192
https://bugs.webkit.org/show_bug.cgi?id=72328

Caused infinite tests to fail (Requested by abarth on
#webkit).

Patch by Sheriff Bot <[email protected]> on 2011-11-14

* Scripts/webkitpy/layout_tests/port/base.py:
* Scripts/webkitpy/layout_tests/port/base_unittest.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (100215 => 100216)


--- trunk/Tools/ChangeLog	2011-11-15 00:39:21 UTC (rev 100215)
+++ trunk/Tools/ChangeLog	2011-11-15 00:47:18 UTC (rev 100216)
@@ -1,3 +1,15 @@
+2011-11-14  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r100192.
+        http://trac.webkit.org/changeset/100192
+        https://bugs.webkit.org/show_bug.cgi?id=72328
+
+        Caused infinite tests to fail (Requested by abarth on
+        #webkit).
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+
 2011-11-14  Tony Chang  <[email protected]>
 
         Remove the CSS3_FLEXBOX compile time flag and enable on all ports

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (100215 => 100216)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py	2011-11-15 00:39:21 UTC (rev 100215)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py	2011-11-15 00:47:18 UTC (rev 100216)
@@ -654,13 +654,7 @@
         Returns:
            Operating-system's environment.
         """
-        env = os.environ.copy()
-        # FIXME: This is a hack.  Tests shouldn't be locale dependent.
-        # This works only in unix environments.
-        env['LANGUAGE'] = 'en'
-        env['LC_MESSAGES'] = 'en_US.utf8'
-        env['LANG'] = 'en_US.UTF-8'
-        return env
+        return os.environ.copy()
 
     def show_results_html_file(self, results_filename):
         """This routine should display the HTML file pointed at by

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py (100215 => 100216)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py	2011-11-15 00:39:21 UTC (rev 100215)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py	2011-11-15 00:47:18 UTC (rev 100216)
@@ -194,13 +194,6 @@
         # This routine is a no-op. We just test it for coverage.
         port.setup_test_run()
 
-    def test_setup_environ_for_server(self):
-        port = self.make_port()
-        env = port.setup_environ_for_server()
-        self.assertEquals(env['LANGUAGE'], 'en')
-        self.assertEquals(env['LC_MESSAGES'], 'en_US.utf8')
-        self.assertEquals(env['LANG'], 'en_US.UTF-8')
-
     def test_test_dirs(self):
         filesystem = MockFileSystem({
             '/mock-checkout/LayoutTests/canvas/test': '',
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to