[QGIS Commit] [qgis/QGIS] cfd9a6: [tests] Update composer scalebar tests, fix except...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/QGIS
  Commit: cfd9a669c8de56635f9754d3269ebb55e74fe942
      https://github.com/qgis/QGIS/commit/cfd9a669c8de56635f9754d3269ebb55e74fe942
  Author: nyalldawson <nyall.dawson at gmail.com>
  Date:   2013-12-28 (Sat, 28 Dec 2013)

  Changed paths:
    M src/core/composer/qgscomposermap.cpp
    M tests/src/core/testqgscomposerscalebar.cpp
    R tests/testdata/control_images/expected_composerscalebar/composerscalebar_doublebox.png
    R tests/testdata/control_images/expected_composerscalebar/composerscalebar_numeric.png
    R tests/testdata/control_images/expected_composerscalebar/composerscalebar_singlebox.png
    R tests/testdata/control_images/expected_composerscalebar/composerscalebar_tick.png
    A tests/testdata/control_images/expected_composerscalebar_doublebox/expected_composerscalebar_doublebox.png
    A tests/testdata/control_images/expected_composerscalebar_numeric/expected_composerscalebar_numeric.png
    A tests/testdata/control_images/expected_composerscalebar_numeric/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_composerscalebar_singlebox/expected_composerscalebar_singlebox.png
    A tests/testdata/control_images/expected_composerscalebar_tick/expected_composerscalebar_tick.png
    A tests/testdata/control_images/expected_composerscalebar_tick/ubuntu_13.04.anomaly.png

  Log Message:
  -----------
  [tests] Update composer scalebar tests, fix exception causing test to fail