| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
|
| index 9118487eebc9343e356e1b1eda9852ccc0b10314..b66909ba13ab4159d3c1519f8aa3ee6460a52cd1 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
|
| @@ -25,7 +25,6 @@
|
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| -
|
| """Unit tests for printing.py."""
|
|
|
| import StringIO
|
| @@ -79,7 +78,7 @@ class FakeShard(object):
|
| self.total_run_time = total_run_time
|
|
|
|
|
| -class Testprinter(unittest.TestCase):
|
| +class Testprinter(unittest.TestCase):
|
| def assertEmpty(self, stream):
|
| self.assertFalse(stream.getvalue())
|
|
|
| @@ -157,7 +156,8 @@ class Testprinter(unittest.TestCase):
|
| }
|
|
|
| printer._print_directory_timings(run_results)
|
| - self.assertWritten(err, ['Time to process slowest subdirectories:\n', ' slowShard took 16.0 seconds to run 1 tests.\n', '\n'])
|
| + self.assertWritten(err, ['Time to process slowest subdirectories:\n', ' slowShard took 16.0 seconds to run 1 tests.\n',
|
| + '\n'])
|
|
|
| printer, err = self.get_printer()
|
| printer._options.debug_rwt_logging = True
|
| @@ -194,27 +194,32 @@ class Testprinter(unittest.TestCase):
|
| def test_test_status_line(self):
|
| printer, _ = self.get_printer()
|
| printer._meter.number_of_columns = lambda: 80
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(80, len(actual))
|
| self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associa...after-index-assertion-fail1.html passed')
|
|
|
| printer._meter.number_of_columns = lambda: 89
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(89, len(actual))
|
| self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associated-...ents-after-index-assertion-fail1.html passed')
|
|
|
| printer._meter.number_of_columns = lambda: sys.maxint
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(90, len(actual))
|
| self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html passed')
|
|
|
| printer._meter.number_of_columns = lambda: 18
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(18, len(actual))
|
| self.assertEqual(actual, '[0/0] f...l passed')
|
|
|
| printer._meter.number_of_columns = lambda: 10
|
| - actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
|
| + actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html',
|
| + ' passed')
|
| self.assertEqual(actual, '[0/0] associated-elements-after-index-assertion-fail1.html passed')
|
|
|
| def test_details(self):
|
|
|