Merge lp:~timo-jyrinki/ubuntu-calendar-app/bug_1293489_mega-merge into lp:ubuntu-calendar-app

[Timo Jyrinki]

Includes:
- lp:~nskaggs/ubuntu-calendar-app/revert-212
- lp:~nskaggs/ubuntu-calendar-app/standalone-ap-for-1293489 (no changes)
- lp:~chris.gagnon/ubuntu-calendar-app/fix_1293489
- lp:~vthompson/ubuntu-calendar-app/scroll-in-test

This is a branch of what I'm currently understanding would be needed in case the crash is not able to be fixed otherwise.

Feel free to ignore this branch or do a better one, it's just here to try to clarify the needed branches.

Includes:
- lp:~nskaggs/ubuntu-calendar-app/revert-212
- lp:~nskaggs/ubuntu-calendar-app/standalone-ap-for-1293489 (no changes)
- lp:~chris.gagnon/ubuntu-calendar-app/fix_1293489
- lp:~vthompson/ubuntu-calendar-app/scroll-in-test

The revert-212 includes all of the 2nd one, and is required to fix/workaround the crasher. The last two are actual fixes to bug #1293489, of fix the scroll-in-test needed to accommodate to the fact that revert-212 changed the code beneath.

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

FAILED: Continuous integration, rev:222
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/329/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1820
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/329/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/329
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/163

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

The fix in my branch is made OBE by the changes in lp:~nskaggs/ubuntu-calendar-app/revert-212 to not input text in the people_field. I think it'd be best to add the input of that field back into this branch.

[Nicholas Skaggs (nskaggs)]

A mega merge, heh. And yes, Victor I removed the input into the people field. I have a branch I've been working on to refactor the tests here: https://code.launchpad.net/~nskaggs/ubuntu-calendar-app/refactor-tests/+merge/211812

It will include the logic to drag the page up so the field can be entered into. For sake of unblocking everything I've removed inputting into this field as the dragging logic introduced other issues inside the test that went beyond the original scope of just getting a working baseline again.

The calendar team has decided to land https://code.launchpad.net/+branch/~nskaggs/ubuntu-calendar-app/revert-212 in order to workaround the issue for now. A proposal will be created to re-add back the code and will be worked inline with the affected bugs.

Anyways, this merge should no longer be needed.

review: Disapprove

Unmerged revisions

222. By Timo Jyrinki on 2014-03-20

Merge lp:~vthompson/ubuntu-calendar-app/scroll-in-test , resolving conflict (no "#input people" section here)

221. By Timo Jyrinki on 2014-03-20

Merge lp:~chris.gagnon/ubuntu-calendar-app/fix_1293489

220. By Timo Jyrinki on 2014-03-20

Merge the lp:~nskaggs/ubuntu-calendar-app/standalone-ap-for-1293489 (already included)

=== modified file 'DayView.qml'
--- DayView.qml	2014-03-06 11:47:25 +0000
+++ DayView.qml	2014-03-20 09:41:42 +0000
@@ -4,8 +4,7 @@
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
-
-Page{
+Item{
     id: root
     objectName: "DayView"
 
@@ -13,11 +12,13 @@
 
     Column {
         id: column
-        anchors.fill: parent
         anchors.top: parent.top
         anchors.topMargin: units.gu(1.5)
+        width: parent.width; height: parent.height
         spacing: units.gu(1)
 
+        anchors.fill: parent
+
         ViewHeader{
             id: viewHeader
             date: currentDay

=== modified file 'MonthView.qml'
--- MonthView.qml	2014-03-06 14:45:43 +0000
+++ MonthView.qml	2014-03-20 09:41:42 +0000
@@ -3,18 +3,23 @@
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
-Page{
-    id: root
+Page {
+    id: monthViewPage
+    objectName: "MonthView"
 
     property var currentMonth: DateExt.today();
+
     signal dateSelected(var date);
 
-    anchors.fill: parent
-
     PathViewBase{
         id: monthViewPath
-        objectName: "MonthView"
-        anchors.fill: parent
+
+        property var startMonth: currentMonth;
+
+        anchors.top:parent.top
+
+        width:parent.width
+        height: parent.height
 
         onNextItemHighlighted: {
             nextMonth();
@@ -25,11 +30,11 @@
         }
 
         function nextMonth() {
-            currentMonth = addMonth(root.currentMonth,1);
+            currentMonth = addMonth(currentMonth,1);
         }
 
         function previousMonth(){
-            currentMonth = addMonth(root.currentMonth,-1);
+            currentMonth = addMonth(currentMonth,-1);
         }
 
         function addMonth(date,month){
@@ -49,16 +54,16 @@
             function getMonthDate() {
                 switch( monthViewPath.indexType(index)) {
                 case 0:
-                    return monthViewPath.addMonth(root.currentMonth,0);
+                    return monthViewPath.startMonth;
                 case -1:
-                    return monthViewPath.addMonth(root.currentMonth,-1);
+                    return monthViewPath.addMonth(monthViewPath.startMonth,-1);
                 case 1:
-                    return monthViewPath.addMonth(root.currentMonth,1);
+                    return monthViewPath.addMonth(monthViewPath.startMonth,1);
                 }
             }
 
             onDateSelected: {
-                root.dateSelected(date);
+                monthViewPage.dateSelected(date);
             }
         }
     }

=== modified file 'WeekView.qml'
--- WeekView.qml	2014-03-06 11:47:25 +0000
+++ WeekView.qml	2014-03-20 09:41:42 +0000
@@ -4,82 +4,82 @@
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
-Page{
+Column {
     id: root
+    objectName: "WeekView"
+
     property var dayStart: new Date();
     property var firstDay: dayStart.weekStart(Qt.locale().firstDayOfWeek);
-
-    Column {
-        objectName: "WeekView"
-
-        anchors.fill: parent
-        anchors.top: parent.top
-        anchors.topMargin: units.gu(1.5)
-        spacing: units.gu(1)
-
-        ViewHeader{
-            id: viewHeader
-            date: dayStart
-        }
-
-        TimeLineHeader{
-            id: weekHeader
-            objectName: "weekHeader"
-            type: typeWeek
-            date: weekViewPath.weekStart
-        }
-
-        PathViewBase{
-            id: weekViewPath
-
-            property var visibleWeek: root.dayStart.weekStart(Qt.locale().firstDayOfWeek);
-            property var weekStart: weekViewPath.visibleWeek
+    anchors.top: parent.top
+    anchors.topMargin: units.gu(1.5)
+    spacing: units.gu(1)
+
+    anchors.fill: parent
+
+    ViewHeader{
+        id: viewHeader
+        date: dayStart
+    }
+
+    TimeLineHeader{
+        id: weekHeader
+        objectName: "weekHeader"
+        type: ViewType.ViewTypeWeek
+        date: weekViewPath.weekStart
+    }
+
+    PathViewBase{
+        id: weekViewPath
+
+        property var visibleWeek: dayStart.weekStart(Qt.locale().firstDayOfWeek);
+        property var weekStart: weekViewPath.visibleWeek
+
+        width: parent.width
+        height: root.height - weekViewPath.y
+
+        onNextItemHighlighted: {
+            nextWeek();
+            weekHeader.incrementCurrentIndex()
+        }
+
+        onPreviousItemHighlighted: {
+            previousWeek();
+            weekHeader.decrementCurrentIndex()
+        }
+
+        function nextWeek() {
+            var weekStartDay = visibleWeek.weekStart(Qt.locale().firstDayOfWeek);
+            dayStart = weekStartDay.addDays(7);
+        }
+
+        function previousWeek(){
+            var weekStartDay = visibleWeek.weekStart(Qt.locale().firstDayOfWeek);
+            dayStart = weekStartDay.addDays(-7);
+        }
+
+        delegate: TimeLineBaseComponent {
+            id: timeLineView
+
+            type: ViewType.ViewTypeWeek
 
             width: parent.width
-            height: root.height - weekViewPath.y
-
-            onNextItemHighlighted: {
-                nextWeek();
-                weekHeader.incrementCurrentIndex()
-            }
-
-            onPreviousItemHighlighted: {
-                previousWeek();
-                weekHeader.decrementCurrentIndex()
-            }
-
-            function nextWeek() {
-                var weekStartDay = visibleWeek.weekStart(Qt.locale().firstDayOfWeek);
-                dayStart = weekStartDay.addDays(7);
-            }
-
-            function previousWeek(){
-                var weekStartDay = visibleWeek.weekStart(Qt.locale().firstDayOfWeek);
-                dayStart = weekStartDay.addDays(-7);
-            }
-
-            delegate: TimeLineBaseComponent {
-                id: timeLineView
-
-                type: typeWeek
-
-                width: parent.width
-                height: parent.height
-                startDay: getWeekStart();
-
-                function getWeekStart() {
-                    switch( weekViewPath.indexType(index)) {
-                    case 0:
-                        return weekViewPath.weekStart;
-                    case -1:
-                        var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
-                        return weekStartDay.addDays(-7);
-                    case 1:
-                        var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
-                        return weekStartDay.addDays(7);
-                    }
+            height: parent.height
+            startDay: getWeekStart();
+
+            function getWeekStart() {
+                switch( weekViewPath.indexType(index)) {
+                case 0:
+                    return weekViewPath.weekStart;
+                case -1:
+                    var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
+                    return weekStartDay.addDays(-7);
+                case 1:
+                    var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
+                    return weekStartDay.addDays(7);
                 }
             }
         }
     }
 }
+
+

=== modified file 'YearView.qml'
--- YearView.qml	2014-03-06 11:43:48 +0000
+++ YearView.qml	2014-03-20 09:41:42 +0000
@@ -3,78 +3,76 @@
 
 import "dateExt.js" as DateExt
 
-Page {
+PathViewBase {
     id: root
     objectName: "YearView"
+
     property var currentYear: DateExt.today();
+
     signal monthSelected(var date);
 
-    PathViewBase {
-        id: pathView
-
-        anchors.fill: parent
-
-        onNextItemHighlighted: {
-            root.currentYear = pathView.getDateFromYear(root.currentYear.getFullYear() + 1);
-        }
-
-        onPreviousItemHighlighted: {
-            root.currentYear = pathView.getDateFromYear(root.currentYear.getFullYear() - 1);
-        }
-
-        function getDateFromYear(year) {
-            return new Date(year,0,1,0,0,0,0);
-        }
-
-        delegate: GridView{
-            id: yearView
-            clip: true
-
-            property bool isCurrentItem: index == pathView.currentIndex
-            property var year: getYear();
-
-            function getYear() {
-                switch( pathView.indexType(index)) {
-                case 0:
-                    return root.currentYear;
-                case -1:
-                    return pathView.getDateFromYear(root.currentYear.getFullYear() - 1);
-                case 1:
-                    return pathView.getDateFromYear(root.currentYear.getFullYear() + 1);
-                }
+    anchors.fill: parent
+
+    onNextItemHighlighted: {
+        currentYear = getDateFromYear(currentYear.getFullYear() + 1);
+    }
+
+    onPreviousItemHighlighted: {
+        currentYear = getDateFromYear(currentYear.getFullYear() - 1);
+    }
+
+    function getDateFromYear(year) {
+        return new Date(year,0,1,0,0,0,0);
+    }
+
+    delegate: GridView{
+        id: yearView
+        clip: true
+
+        property bool isCurrentItem: index == root.currentIndex
+        property var year: getYear();
+
+        function getYear() {
+            switch( root.indexType(index)) {
+            case 0:
+                return currentYear;
+            case -1:
+                return getDateFromYear(currentYear.getFullYear() - 1);
+            case 1:
+                return getDateFromYear(currentYear.getFullYear() + 1);
             }
-
-            width: parent.width
-            height: parent.height
-            anchors.top: parent.top
-
-            readonly property int minCellWidth: units.gu(30)
-            cellWidth: Math.floor(Math.min.apply(Math, [3, 4].map(function(n)
+        }
+
+        width: parent.width
+        height: parent.height
+        anchors.top: parent.top
+
+        readonly property int minCellWidth: units.gu(30)
+        cellWidth: Math.floor(Math.min.apply(Math, [3, 4].map(function(n)
             { return ((width / n >= minCellWidth) ? width / n : width / 2) })))
 
-            cellHeight: cellWidth * 1.4
-
-            model: 12 /* months in a year */
-            delegate: Item {
-                width: yearView.cellWidth
-                height: yearView.cellHeight
-
-                MonthComponent{
-                    id: monthComponent
-                    monthDate: new Date(yearView.year.getFullYear(),index,1,0,0,0,0)
+        cellHeight: cellWidth * 1.4
+
+        model: 12 /* months in a year */
+        delegate: Item {
+            width: yearView.cellWidth
+            height: yearView.cellHeight
+
+            MonthComponent{
+                id: monthComponent
+                monthDate: new Date(yearView.year.getFullYear(),index,1,0,0,0,0)
+                anchors.fill: parent
+                anchors.margins: units.gu(0.5)
+
+                dayLabelFontSize:"x-small"
+                dateLabelFontSize: "medium"
+                monthLabelFontSize: "medium"
+                yearLabelFontSize: "small"
+
+                MouseArea{
                     anchors.fill: parent
-                    anchors.margins: units.gu(0.5)
-
-                    dayLabelFontSize:"x-small"
-                    dateLabelFontSize: "medium"
-                    monthLabelFontSize: "medium"
-                    yearLabelFontSize: "small"
-
-                    MouseArea{
-                        anchors.fill: parent
-                        onClicked: {
-                            root.monthSelected(monthComponent.monthDate);
-                        }
+                    onClicked: {
+                        root.monthSelected(monthComponent.monthDate);
                     }
                 }
             }

=== modified file 'calendar.qml'
--- calendar.qml	2014-03-12 00:17:00 +0000
+++ calendar.qml	2014-03-20 09:41:42 +0000
@@ -76,16 +76,14 @@
             property int endtime: -1;
 
             onCurrentDayChanged: {
-                if( monthPage.item
-                        && monthPage.item.currentMonth !== undefined
-                        && !monthPage.item.currentMonth.isSameDay(currentDay))
-                    monthPage.item.currentMonth = currentDay.midnight();
-
-                if( dayPage.item && !dayPage.item.currentDay.isSameDay(currentDay))
-                    dayPage.item.currentDay = currentDay
-
-                if( weekPage.item && !weekPage.item.dayStart.isSameDay(currentDay))
-                    weekPage.item.dayStart = currentDay
+                if( monthView.currentMonth !== undefined && !monthView.currentMonth.isSameDay(currentDay))
+                    monthView.currentMonth = currentDay.midnight();
+
+                if( !dayView.currentDay.isSameDay(currentDay))
+                    dayView.currentDay = currentDay
+
+                if( !weekView.dayStart.isSameDay(currentDay))
+                    weekView.dayStart = currentDay
 
                 setStartEndDateToModel();
             }
@@ -135,13 +133,13 @@
                 var difference = endTime - startTime;
 
                 if (difference > month)
-                    return yearTab.index;   // Year view
+                    return 0;   // Year view
                 else if (difference > 7 * day)
-                    return monthTab.index;   // Month view}
+                    return 1;   // Month view}
                 else if (difference > day)
-                    return weekTab.index;   // Week view
+                    return 2;   // Week view
                 else
-                    return dayTab.index;   // Day view
+                    return 3;   // Day view
             }
 
             // This function parse the argument
@@ -180,17 +178,17 @@
                         }
                         else {
                             // If no endtime has been setted, open the starttime date in day view
-                            tabs.selectedTabIndex = dayTab.index;
+                            tabs.selectedTabIndex = 3;
                         }
                     } // End of else if (starttime)
                     else {
                         // Due to bug #1231558 {if (args.defaultArgument.at(0))} is always true
                         // After the fix we can delete this else
-                        tabs.selectedTabIndex = monthTab.index;
+                        tabs.selectedTabIndex= 1;
                     }
                 } // End of if about args.values
                 else {
-                    tabs.selectedTabIndex = monthTab.index;
+                    tabs.selectedTabIndex= 1;
                 }
 
                 globalModel = GlobalModel.globalModel();
@@ -235,124 +233,71 @@
 
             Tabs{
                 id: tabs
-
                 Tab{
-                    id: yearTab
                     objectName: "yearTab"
                     title: i18n.tr("Year")
-                    page: Loader{
-                        id: yearPage
+                    page: Page{
                         objectName: "yearPage"
-                        anchors {
-                            top: parent.top
-                            left: parent.left
-                            right: parent.right
-                            bottom: parent.bottom
-                        }
-                        source: (tabs.selectedTab === yearTab) ? Qt.resolvedUrl("YearView.qml") : ""
-
-                        onLoaded:{
-                            item.tools = commonToolBar
-                        }
-
-                        Connections{
-                            target: yearPage.item
+                        anchors.fill: parent
+                        tools: commonToolBar
+                        YearView{
                             onMonthSelected: {
-                                tabs.selectedTabIndex = monthTab.index
+                                tabs.selectedTabIndex = 1
                                 var now = DateExt.today();
                                 if( date.getMonth() === now.getMonth()
                                         && date.getFullYear() === now.getFullYear()) {
-                                    tabPage.currentDay = now;
+                                    monthView.currentMonth = now
                                 } else {
-                                    tabPage.currentDay = date.midnight();
+                                    monthView.currentMonth = date.midnight();
                                 }
                             }
                         }
                     }
                 }
-
                 Tab {
                     id: monthTab
                     objectName: "monthTab"
                     title: i18n.tr("Month")
-
-                    page: Loader{
-                        id: monthPage
-                        anchors {
-                            top: parent.top
-                            left: parent.left
-                            right: parent.right
-                            bottom: parent.bottom
-                        }
-
-                        source: (tabs.selectedTab === monthTab) ? Qt.resolvedUrl("MonthView.qml") : ""
-
-                        onLoaded: {
-                            item.currentMonth = tabPage.currentDay.midnight();
-                            item.tools = commonToolBar
-                        }
-
-                        Connections{
-                            target: monthPage.item
-                            onDateSelected: {
-                                tabs.selectedTabIndex = dayTab.index
-                                tabPage.currentDay = date;
-                            }
+                    page: MonthView{
+                        anchors.fill: parent
+                        tools: commonToolBar
+                        id: monthView
+
+                        onDateSelected: {
+                            tabs.selectedTabIndex  = 3
+                            tabPage.currentDay = date;
                         }
                     }
                 }
-
                 Tab{
-                    id: weekTab
                     objectName: "weekTab"
                     title: i18n.tr("Week")
-                    page: Loader{
-                        id: weekPage
-                        anchors {
-                            top: parent.top
-                            left: parent.left
-                            right: parent.right
-                            bottom: parent.bottom
-                        }
-                        source: (tabs.selectedTab === weekTab) ? Qt.resolvedUrl("WeekView.qml") : ""
-
-                        onLoaded: {
-                            item.dayStart = tabPage.currentDay;
-                            item.tools = commonToolBar
-                        }
-
-                        Connections{
-                            target: weekPage.item
+                    page: Page{
+                        anchors.fill: parent
+                        tools: commonToolBar
+                        WeekView{
+                            id: weekView
+                            anchors.fill: parent
+
                             onDayStartChanged: {
-                                tabPage.currentDay = weekPage.item.dayStart;
+                                tabPage.currentDay = dayStart;
                             }
                         }
                     }
                 }
 
                 Tab{
-                    id: dayTab
                     objectName: "dayTab"
                     title: i18n.tr("Day")
-                    page: Loader{
-                        id: dayPage
-                        anchors {
-                            top: parent.top
-                            left: parent.left
-                            right: parent.right
-                            bottom: parent.bottom
-                        }
-                        source: (tabs.selectedTab === dayTab) ? Qt.resolvedUrl("DayView.qml") : ""
-
-                        onLoaded: {
-                            item.currentDay = tabPage.currentDay;
-                            item.tools = commonToolBar
-                        }
-
-                        Connections{
-                            target: dayPage.item
+                    page: Page{
+                        anchors.fill: parent
+                        tools: commonToolBar
+                        DayView{
+                            id: dayView
+                            anchors.fill: parent
+
                             onCurrentDayChanged: {
-                                tabPage.currentDay = dayPage.item.currentDay;
+                                tabPage.currentDay = currentDay;
                             }
                         }
                     }

=== modified file 'tests/autopilot/calendar_app/emulators.py'
--- tests/autopilot/calendar_app/emulators.py	2013-12-16 21:32:43 +0000
+++ tests/autopilot/calendar_app/emulators.py	2014-03-20 09:41:42 +0000
@@ -103,3 +103,6 @@
     def get_month_name(self, component):
         return component.wait_select_single(
             "Label", objectName="monthLabel").text
+
+    def get_num_events(self):
+        return len(self.select_many("EventBubble"))

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2014-01-31 21:15:52 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2014-03-20 09:41:42 +0000
@@ -22,6 +22,12 @@
 import shutil
 import logging
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+import tempfile
+
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
@@ -45,15 +51,11 @@
 
     local_location = "../../calendar.qml"
     installed_location = "/usr/share/calendar-app/calendar.qml"
-    sqlite_dir = os.path.expanduser(
-        "~/.local/share/com.ubuntu.calendar/Databases")
-    backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
+        self.home_dir = self._patch_home()
         super(CalendarTestCase, self).setUp()
-        self.temp_move_sqlite_db()
-        self.addCleanup(self.restore_sqlite_db)
 
         #turn off the OSK so it doesn't block screen elements
         if model() != 'Desktop':
@@ -73,6 +75,7 @@
             self.launch_test_click()
 
     def launch_test_local(self):
+        logger.debug("Running via local installation")
         self.app = self.launch_test_application(
             "qmlscene",
             self.local_location,
@@ -80,6 +83,7 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
+        logger.debug("Running via installed debian package")
         self.app = self.launch_test_application(
             "qmlscene",
             self.installed_location,
@@ -87,39 +91,30 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_click(self):
+        logger.debug("Running via click package")
         self.app = self.launch_click_package(
             "com.ubuntu.calendar",
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
-    def temp_move_sqlite_db(self):
-        try:
-            shutil.rmtree(self.backup_dir)
-        except:
-            pass
-        else:
-            logger.warning("Prexisting backup database found and removed")
-
-        try:
-            shutil.move(self.sqlite_dir, self.backup_dir)
-        except:
-            logger.warning("No current database found")
-        else:
-            logger.debug("Backed up database")
-
-    def restore_sqlite_db(self):
-        if os.path.exists(self.backup_dir):
-            if os.path.exists(self.sqlite_dir):
-                try:
-                    shutil.rmtree(self.sqlite_dir)
-                except:
-                    logger.error("Failed to remove test database and restore" /
-                                 "database")
-                    return
-            try:
-                shutil.move(self.backup_dir, self.sqlite_dir)
-            except:
-                logger.error("Failed to restore database")
+    def _patch_home(self):
+        #make a temp dir
+        temp_dir = tempfile.mkdtemp()
+        logger.debug("Created fake home directory " + temp_dir)
+        self.addCleanup(shutil.rmtree, temp_dir)
+        #if the Xauthority file is in home directory
+        #make sure we copy it to temp home, otherwise do nothing
+        xauth = os.path.expanduser(os.path.join('~', '.Xauthority'))
+        if os.path.isfile(xauth):
+            logger.debug("Copying .Xauthority to fake home " + temp_dir)
+            shutil.copyfile(
+                os.path.expanduser(os.path.join('~', '.Xauthority')),
+                os.path.join(temp_dir, '.Xauthority'))
+        patcher = mock.patch.dict('os.environ', {'HOME': temp_dir})
+        patcher.start()
+        logger.debug("Patched home to fake home directory " + temp_dir)
+        self.addCleanup(patcher.stop)
+        return temp_dir
 
     @property
     def main_view(self):
-        return self.app.select_single(emulators.MainView)
+        return self.app.wait_select_single(emulators.MainView)

=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/calendar_app/tests/test_calendar.py	2014-01-11 06:05:42 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2014-03-20 09:41:42 +0000
@@ -11,7 +11,7 @@
 
 from autopilot.matchers import Eventually
 
-from testtools.matchers import Equals, Not, Is
+from testtools.matchers import Equals, Not, Is, NotEquals
 
 import time
 
@@ -46,6 +46,10 @@
 
     def test_new_event(self):
         """test add new event """
+        #go to today
+        self.main_view.switch_to_tab("dayTab")
+        self.main_view.open_toolbar().click_button("todaybutton")
+        num_events = self.main_view.get_num_events()
 
         #click on new event button
         self.main_view.open_toolbar().click_button("neweventbutton")
@@ -68,7 +72,7 @@
         ok = picker.select_single("Button", objectName="TimePickerOKButton")
         self.pointing_device.click_object(ok)
 
-        # Set the end time
+        ## Set the end time
         end_time_field = self.main_view.get_event_end_time_field()
         self.pointing_device.click_object(end_time_field)
         picker = self.main_view.get_time_picker()
@@ -83,18 +87,16 @@
         self.keyboard.type("My location")
         self.assertThat(location_field.text, Eventually(Equals("My location")))
 
-        #input people
-        people_field = self.main_view.get_event_people_field()
-        self.pointing_device.click_object(people_field)
-        self.assertThat(people_field.activeFocus, Eventually(Equals(True)))
-        self.keyboard.type("Me")
-        self.assertThat(people_field.text, Eventually(Equals("Me")))
+        # scroll to make bottom fields visible
+        self.pointing_device.move_to_object(location_field)
+        x1 = self.main_view.height/2
+        y1 = self.main_view.width/2
+        self.pointing_device.drag(x1, y1, x1, y1 - y1/2)
 
         #click save button
         self.main_view.open_toolbar().click_button("eventSaveButton")
 
         #verify that the event has been created in timeline
-        self.main_view.switch_to_tab("dayTab")
-        self.assertThat(lambda: self.main_view.get_label_with_text(
-                        eventTitle, root=self.main_view.get_day_view()),
-                        Eventually(Not(Is(None))))
+        self.main_view.open_toolbar().click_button("todaybutton")
+        self.assertThat(self.main_view.get_num_events,
+                        Eventually(NotEquals(num_events)))