Merge lp:~popey/ubuntu-calendar-app/reduce-typing into lp:ubuntu-calendar-app

[Alan Pope 🍺🐧🐱 🦄]

Shorten text to reduce test run duration.

The AP tests spend a fair amount of time typing in long UUIDs. Shorter (8 char) UUIDs are unique enough and reduce typing immensely. Given many tests type the same UUID in 3 times, we can save a good bunch of minutes on each test run by shortening the text.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:655
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1186/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2864
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2864/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/657
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/183

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1186/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

+1 for speed.

review: Approve

=== modified file 'tests/autopilot/calendar_app/data.py'
--- tests/autopilot/calendar_app/data.py	2014-07-30 21:45:13 +0000
+++ tests/autopilot/calendar_app/data.py	2015-06-01 13:17:20 +0000
@@ -50,10 +50,10 @@
     def make_unique(cls, unique_id=None):
         """Return a unique event."""
         if unique_id is None:
-            unique_id = str(uuid.uuid1())
+            unique_id = str(uuid.uuid4())[:8]
         calendar = 'Personal'
-        name = 'Test event {}'.format(unique_id)
-        description = 'Test description {}.'.format(unique_id)
-        location = 'Test location {}'.format(unique_id)
+        name = 'Test ev {}'.format(unique_id)
+        description = 'Test desc {}.'.format(unique_id)
+        location = 'Test loc {}'.format(unique_id)
         guests = ['UX User']
         return cls(calendar, name, description, location, guests)

=== modified file 'tests/autopilot/calendar_app/tests/test_data.py'
--- tests/autopilot/calendar_app/tests/test_data.py	2014-07-31 15:59:26 +0000
+++ tests/autopilot/calendar_app/tests/test_data.py	2015-06-01 13:17:20 +0000
@@ -25,7 +25,7 @@
         event = data.Event.make_unique(unique_id='test uuid')
 
         self.assertEqual(event.calendar, 'Personal')
-        self.assertEqual(event.name, 'Test event test uuid')
-        self.assertEqual(event.description, 'Test description test uuid.')
-        self.assertEqual(event.location, 'Test location test uuid')
+        self.assertEqual(event.name, 'Test ev test uuid')
+        self.assertEqual(event.description, 'Test desc test uuid.')
+        self.assertEqual(event.location, 'Test loc test uuid')
         self.assertEqual(event.guests, ['UX User'])