Merge lp:~azzar1/indicator-datetime/31-june-its-not-a-thing into lp:indicator-datetime

Proposed by Andrea Azzarone on 2017-08-29
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2017-08-30
Approved revision: 490
Merged at revision: 489
Proposed branch: lp:~azzar1/indicator-datetime/31-june-its-not-a-thing
Merge into: lp:indicator-datetime
Prerequisite: lp:~3v1n0/indicator-datetime/calendar-data-files
Diff against target: 107 lines (+8/-9)
7 files modified
tests/test-eds-ics-all-day-events.cpp (+1/-1)
tests/test-eds-ics-missing-trigger.cpp (+2/-3)
tests/test-eds-ics-non-attending-alarms.cpp (+1/-1)
tests/test-eds-ics-non-selected-source.cpp (+1/-1)
tests/test-eds-ics-nonrepeating-events.cpp (+1/-1)
tests/test-eds-ics-repeating-events.cpp (+1/-1)
tests/test-eds-ics-repeating-valarms.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/indicator-datetime/31-june-its-not-a-thing
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2017-08-29 Approve on 2017-08-30
unity-api-1-bot continuous-integration Approve on 2017-08-29
Review via email: mp+329819@code.launchpad.net

Commit message

Use 30-jun instaed of 31-jun.

Description of the change

Use 30-jun instaed of 31-jun.

To post a comment you must log in.
490. By Andrea Azzarone on 2017-08-29

As we removed a day we need to edit the test too.

unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:490
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/29/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1940
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1947
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1727/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1727
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1727/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/29/rebuild

review: Approve (continuous-integration)
Marco Trevisan (Treviño) (3v1n0) wrote :

What the hell!

I want 30 February too...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test-eds-ics-all-day-events.cpp'
2--- tests/test-eds-ics-all-day-events.cpp 2016-05-14 02:07:10 +0000
3+++ tests/test-eds-ics-all-day-events.cpp 2017-08-29 15:19:46 +0000
4@@ -52,7 +52,7 @@
5 // make a planner that looks at the first half of 2015 in EDS
6 auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
7 const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
8- const DateTime range_end {gtz, 2015,6,31,23,59,59.5};
9+ const DateTime range_end {gtz, 2015,6,30,23,59,59.5};
10 planner->range().set(std::make_pair(range_begin, range_end));
11
12 // give EDS a moment to load
13
14=== modified file 'tests/test-eds-ics-missing-trigger.cpp'
15--- tests/test-eds-ics-missing-trigger.cpp 2016-05-14 02:07:10 +0000
16+++ tests/test-eds-ics-missing-trigger.cpp 2017-08-29 15:19:46 +0000
17@@ -52,7 +52,7 @@
18 // make a planner that looks at the first half of 2015 in EDS
19 auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
20 const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
21- const DateTime range_end {gtz, 2015,6,31,23,59,59.5};
22+ const DateTime range_end {gtz, 2015,6,30,23,59,59.5};
23 planner->range().set(std::make_pair(range_begin, range_end));
24
25 // give EDS a moment to load
26@@ -87,7 +87,7 @@
27 a.uid = "20150617T211913Z-6217-32011-2036-5@ubuntu-phablet";
28 a.summary = "Recurring Alarm";
29 a.alarms[0].text = a.summary;
30- std::array<DateTime,14> recurrences {
31+ std::array<DateTime,13> recurrences {
32 DateTime{ gtz, 2015, 6, 18, 10, 1, 0 },
33 DateTime{ gtz, 2015, 6, 19, 10, 1, 0 },
34 DateTime{ gtz, 2015, 6, 20, 10, 1, 0 },
35@@ -101,7 +101,6 @@
36 DateTime{ gtz, 2015, 6, 28, 10, 1, 0 },
37 DateTime{ gtz, 2015, 6, 29, 10, 1, 0 },
38 DateTime{ gtz, 2015, 6, 30, 10, 1, 0 },
39- DateTime{ gtz, 2015, 7, 1, 10, 1, 0 }
40 };
41 for (const auto& time : recurrences) {
42 a.begin = a.end = a.alarms[0].time = time;
43
44=== modified file 'tests/test-eds-ics-non-attending-alarms.cpp'
45--- tests/test-eds-ics-non-attending-alarms.cpp 2016-05-14 02:16:53 +0000
46+++ tests/test-eds-ics-non-attending-alarms.cpp 2017-08-29 15:19:46 +0000
47@@ -52,7 +52,7 @@
48 // make a planner that looks at the first half of 2016 in EDS
49 auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
50 const DateTime range_begin {gtz, 2016,1, 1, 0, 0, 0.0};
51- const DateTime range_end {gtz, 2016,6,31,23,59,59.5};
52+ const DateTime range_end {gtz, 2016,6,30,23,59,59.5};
53 planner->range().set(std::make_pair(range_begin, range_end));
54
55 // give EDS a moment to load
56
57=== modified file 'tests/test-eds-ics-non-selected-source.cpp'
58--- tests/test-eds-ics-non-selected-source.cpp 2016-06-21 21:39:39 +0000
59+++ tests/test-eds-ics-non-selected-source.cpp 2017-08-29 15:19:46 +0000
60@@ -50,7 +50,7 @@
61 // make a planner that looks at the first half of 2015 in EDS
62 auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
63 const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
64- const DateTime range_end {gtz, 2015,6,31,23,59,59.5};
65+ const DateTime range_end {gtz, 2015,6,30,23,59,59.5};
66 planner->range().set(std::make_pair(range_begin, range_end));
67
68 // give EDS a moment to load
69
70=== modified file 'tests/test-eds-ics-nonrepeating-events.cpp'
71--- tests/test-eds-ics-nonrepeating-events.cpp 2016-05-14 02:07:10 +0000
72+++ tests/test-eds-ics-nonrepeating-events.cpp 2017-08-29 15:19:46 +0000
73@@ -52,7 +52,7 @@
74 // make a planner that looks at the first half of 2015 in EDS
75 auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
76 const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
77- const DateTime range_end {gtz, 2015,6,31,23,59,59.5};
78+ const DateTime range_end {gtz, 2015,6,30,23,59,59.5};
79 planner->range().set(std::make_pair(range_begin, range_end));
80
81 // give EDS a moment to load
82
83=== modified file 'tests/test-eds-ics-repeating-events.cpp'
84--- tests/test-eds-ics-repeating-events.cpp 2016-05-14 02:07:10 +0000
85+++ tests/test-eds-ics-repeating-events.cpp 2017-08-29 15:19:46 +0000
86@@ -52,7 +52,7 @@
87 // make a planner that looks at the first half of 2015 in EDS
88 auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
89 const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
90- const DateTime range_end {gtz, 2015,6,31,23,59,59.5};
91+ const DateTime range_end {gtz, 2015,6,30,23,59,59.5};
92 planner->range().set(std::make_pair(range_begin, range_end));
93
94 // give EDS a moment to load
95
96=== modified file 'tests/test-eds-ics-repeating-valarms.cpp'
97--- tests/test-eds-ics-repeating-valarms.cpp 2016-05-14 02:07:10 +0000
98+++ tests/test-eds-ics-repeating-valarms.cpp 2017-08-29 15:19:46 +0000
99@@ -52,7 +52,7 @@
100 // make a planner that looks at the first half of 2015 in EDS
101 auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
102 const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0};
103- const DateTime range_end {gtz, 2015,6,31,23,59,59.5};
104+ const DateTime range_end {gtz, 2015,6,30,23,59,59.5};
105 planner->range().set(std::make_pair(range_begin, range_end));
106
107 // give EDS a moment to load

Subscribers

People subscribed via source and target branches