1
=== modified file 'debian/changelog'
2
--- debian/changelog	2015-02-13 10:36:27 +0000
3
+++ debian/changelog	2015-02-23 05:06:41 +0000
4
@@ -1,14 +1,14 @@
5
1
unity-scopes-api (0.6.14+15.04.20150213-0ubuntu1) vivid; urgency=medium
1
unity-scopes-api (0.6.14+15.04.20150213-0ubuntu1) vivid; urgency=medium
6
2
2
7
3
  [ Michi Henning ]
3
  [ Michi Henning ]
13
4
  * Added push_surfacing_results_from_cache() to Reply proxy. This allows a scope
4
  * Added push_surfacing_results_from_cache() to Reply proxy. This allows
14
5
    to reply the results of the last succesful surfacing query from an on-disk cache.
5
    a scope to reply the results of the last succesful surfacing query
15
6
    This is useful to prevent the user being presented with an empty screen when
6
    from an on-disk cache.  This is useful to prevent the user being
16
7
    swiping to the scope while the device has no network access, or the scope's
7
    presented with an empty screen when swiping to the scope while the
17
8
    data source is off-line.
8
    device has no network access, or the scope's data source is off-line.
18
9
9
21
10
    Note: This is change is ABI compatible with gcc and clang despite the addition 
10
    Note: This is change is ABI compatible with gcc and clang despite
22
11
          a new virtual function.
11
          the addition a new virtual function.
23
12
  * Fixed sporadic failure in JsonAsyncReader test caused by slow DNS.
12
  * Fixed sporadic failure in JsonAsyncReader test caused by slow DNS.
24
13
    Improved tests to report exception details if an exception other
13
    Improved tests to report exception details if an exception other
25
14
    than the expected one is thrown.
14
    than the expected one is thrown.
26
15
15
27
=== modified file 'src/scopes/internal/RuntimeImpl.cpp'
28
--- src/scopes/internal/RuntimeImpl.cpp	2015-02-04 06:07:15 +0000
29
+++ src/scopes/internal/RuntimeImpl.cpp	2015-02-23 05:06:41 +0000
30
@@ -562,13 +562,18 @@
31
562
{
562
{
32
563
    auto is_confined = []
563
    auto is_confined = []
33
564
    {
564
    {
35
565
        // Find out whether we are confined. aa_getcon() returns -1 in that case.
565
        // Find out whether we are confined. aa_getcon() returns -1 with EACCESS in that case.
36
566
        char* con = nullptr;
566
        char* con = nullptr;
37
567
        char* mode;
567
        char* mode;
38
568
        int rc = aa_getcon(&con, &mode);
568
        int rc = aa_getcon(&con, &mode);
39
569
        int error = errno;
40
570
        if (rc == -1)
41
571
        {
42
572
            cerr << "aa_getcon failed, errno = " << error << endl;
43
573
        }
44
569
        // Only con (not mode) must be deallocated
574
        // Only con (not mode) must be deallocated
45
570
        free(con);
575
        free(con);
47
571
        return rc == -1;
576
        return rc == -1 && error == EACCES;
48
572
    };
577
    };
49
573
    static bool confined = is_confined();
578
    static bool confined = is_confined();
50
574
    return confined;
579
    return confined;
51
575
580
52
=== modified file 'test/gtest/scopes/ResultCache/ResultCache_test.cpp'
53
--- test/gtest/scopes/ResultCache/ResultCache_test.cpp	2015-02-05 09:35:42 +0000
54
+++ test/gtest/scopes/ResultCache/ResultCache_test.cpp	2015-02-23 05:06:41 +0000
55
@@ -167,6 +167,11 @@
56
167
    EXPECT_FALSE(boost::filesystem::exists(TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache", ec));
167
    EXPECT_FALSE(boost::filesystem::exists(TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache", ec));
57
168
}
168
}
58
169
169
59
170
// Stop warnings about unused return value from system()
60
171
61
172
#pragma GCC diagnostic push
62
173
#pragma GCC diagnostic ignored "-Wunused-result"
63
174
64
170
TEST_F(CacheScopeTest, surfacing_query)
175
TEST_F(CacheScopeTest, surfacing_query)
65
171
{
176
{
66
172
    ::unlink(TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache");
177
    ::unlink(TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache");
67
@@ -187,6 +192,8 @@
68
187
    system("cat " TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache");
192
    system("cat " TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache");
69
188
}
193
}
70
189
194
71
195
#pragma GCC diagnostic pop
72
196
73
190
// Run another non-surfacing query before checking that the cache contains the
197
// Run another non-surfacing query before checking that the cache contains the
74
191
// results of the last surfacing query.
198
// results of the last surfacing query.
75
192
199
76
193
200
77
=== modified file 'test/gtest/scopes/stress/Runtime.ini.in'
78
--- test/gtest/scopes/stress/Runtime.ini.in	2014-12-09 04:37:59 +0000
79
+++ test/gtest/scopes/stress/Runtime.ini.in	2015-02-23 05:06:41 +0000
80
@@ -4,4 +4,5 @@
81
4
Default.Middleware = Zmq
4
Default.Middleware = Zmq
82
5
Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
5
Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
83
6
Smartscopes.Registry.Identity =
6
Smartscopes.Registry.Identity =
84
7
CacheDir=@CMAKE_CURRENT_BINARY_DIR@
85
7
LogDir=
8
LogDir=
Status:	Merged
Approved by:	Paweł Stołowski on 2015-02-23
Approved revision:	318
Merged at revision:	318
Proposed branch:	lp:~michihenning/unity-scopes-api/fix-chroot-tests
Merge into:	lp:unity-scopes-api
Diff against target:	85 lines (+22/-9) 4 files modified debian/changelog (+7/-7) src/scopes/internal/RuntimeImpl.cpp (+7/-2) test/gtest/scopes/ResultCache/ResultCache_test.cpp (+7/-0) test/gtest/scopes/stress/Runtime.ini.in (+1/-0)
To merge this branch:	bzr merge lp:~michihenning/unity-scopes-api/fix-chroot-tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Paweł Stołowski (community)		2015-02-17	Approve on 2015-02-23
PS Jenkins bot (community)	continuous-integration		Approve on 2015-02-23
Review via email: mp+249916@code.launchpad.net