Merge lp:~xavi-garcia-mena/keeper/link-against-real-storage-framework into lp:keeper

[Xavi Garcia]

The branch links keeper-service against the non-local version of storage-framework

FOR TESTING PURPOSES ONLY

The branch links keeper-service against the non-local version of storage-framework

[lp:~xavi-garcia-mena/keeper/link-against-real-storage-framework]

93. By Xavi Garcia on 2016-08-17

Added extra log statements to check error in some architectures

94. By Xavi Garcia on 2016-08-17

Using system write instead of QLocalSocket in fake helper

95. By Xavi Garcia on 2016-08-17

Remove helper's mark before starting any test

96. By Xavi Garcia on 2016-08-17

added extra check

97. By Xavi Garcia on 2016-08-17

Added new check before starting the failure test

98. By Xavi Garcia on 2016-08-17

Moved check to another location

99. By Xavi Garcia on 2016-08-17

Remove helper mark before calling StartBackup

[Charles Kerr (charlesk)]

dual service looks fine.

Only question I have is the write() change from r94, what's that for?

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-11 08:09:10 +0000
+++ CMakeLists.txt	2016-08-17 13:56:36 +0000
@@ -78,10 +78,19 @@
     gobject-2.0
     json-glib-1.0
     libarchive>=3.1.2
+    uuid>=2.25
+)
+
+pkg_check_modules(SERVICE_PRODUCTION_SF_DEPS REQUIRED
+    storage-framework-qt-client-1
+)
+
+pkg_check_modules(SERVICE_DEVEL_SF_DEPS REQUIRED
     storage-framework-qt-local-client-1
-    uuid>=2.25
 )
+
 include_directories(SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
+include_directories(SYSTEM ${SERVICE_PRODUCTION_SF_DEPS_INCLUDE_DIRS})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 
 

=== modified file 'src/helper/backup-helper.cpp'
--- src/helper/backup-helper.cpp	2016-08-11 04:27:48 +0000
+++ src/helper/backup-helper.cpp	2016-08-17 13:56:36 +0000
@@ -231,10 +231,12 @@
 
         if (n_uploaded_ == q_ptr->expected_size())
         {
+            qDebug() << "n_uploaded = " << n_uploaded_ << " expected = " << q_ptr->expected_size() << " --- COMPLETE";
             q_ptr->set_state(Helper::State::COMPLETE);
         }
         else if (read_error_ || write_error_ || n_uploaded_ != q_ptr->expected_size())
         {
+            qDebug() << "n_uploaded = " << n_uploaded_ << " expected = " << q_ptr->expected_size() << " --- FAILED";
             q_ptr->set_state(Helper::State::FAILED);
         }
         else if (cancelled_)

=== modified file 'src/service/CMakeLists.txt'
--- src/service/CMakeLists.txt	2016-08-11 08:09:10 +0000
+++ src/service/CMakeLists.txt	2016-08-17 13:56:36 +0000
@@ -1,5 +1,6 @@
 set(SERVICE_LIB "keeperservice")
 set(SERVICE_EXEC "keeper-service")
+set(SERVICE_LOCAL_EXEC "keeper-service-local")
 
 include_directories("${CMAKE_SOURCE_DIR}/src")
 include_directories("${CMAKE_BINARY_DIR}/src/qdbus-stubs")
@@ -27,18 +28,39 @@
   ${SERVICE_EXEC_SOURCES}
 )
 
+add_executable(
+  ${SERVICE_LOCAL_EXEC}
+  ${SERVICE_EXEC_SOURCES}
+)
+
 link_directories(
   ${SERVICE_DEPS_LIBRARY_DIRS}
 )
 
-target_link_libraries(
-  ${SERVICE_EXEC}
-  ${SERVICE_LIB}
+set(
+  SERVICE_STATIC_LIBS
   util
   qdbus-stubs
   storage-framework
   backup-helper
-  ${SERVICE_DEPS_LIBRARIES}
+)
+
+target_link_libraries(
+  ${SERVICE_EXEC}
+  ${SERVICE_LIB}
+  ${SERVICE_STATIC_LIBS}
+  ${SERVICE_DEPS_LIBRARIES}
+  ${SERVICE_PRODUCTION_SF_DEPS_LIBRARIES}
+  Qt5::Core
+  Qt5::DBus
+)
+
+target_link_libraries(
+  ${SERVICE_LOCAL_EXEC}
+  ${SERVICE_LIB}
+  ${SERVICE_STATIC_LIBS}
+  ${SERVICE_DEPS_LIBRARIES}
+  ${SERVICE_DEVEL_SF_DEPS_LIBRARIES}
   Qt5::Core
   Qt5::DBus
 )

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-08-11 08:09:10 +0000
+++ tests/CMakeLists.txt	2016-08-17 13:56:36 +0000
@@ -32,7 +32,7 @@
   -DCMAKE_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
   -DCMAKE_BINARY_DIR="${CMAKE_CURRENT_BINARY_DIR}"
   -DTEST_SIMPLE_HELPER="${CMAKE_BINARY_DIR}/tests/fakes/${BACKUP_HELPER}"
-  -DKEEPER_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/service/keeper-service"
+  -DKEEPER_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/service/keeper-service-local"
   -DKEEPER_TAR_CREATE_BIN="${KEEPER_TAR_CREATE_BIN}"
 )
 

=== modified file 'tests/fakes/fake-backup-helper.cpp'
--- tests/fakes/fake-backup-helper.cpp	2016-08-10 02:06:08 +0000
+++ tests/fakes/fake-backup-helper.cpp	2016-08-17 13:56:36 +0000
@@ -30,6 +30,8 @@
 #include <QProcessEnvironment>
 #include <QLocalSocket>
 
+#include <unistd.h>
+
 int
 main(int argc, char **argv)
 {
@@ -71,10 +73,9 @@
     const auto ufd = fd_reply.value();
 
     // write the blob
-    QLocalSocket sock;
-    sock.setSocketDescriptor(ufd.fileDescriptor());
-    qDebug() << "wrote" << sock.write(blob) << "bytes";
-    sock.flush();
+    const auto fd = ufd.fileDescriptor();
+    const auto n_written_in = write(fd, blob.constData(), blob.size());
+    qDebug() << "wrote" << n_written_in << "bytes";
 
     // create the mark file so we can check when it finished without upstart
     QFile markFile(SIMPLE_HELPER_MARK_FILE_PATH);

=== modified file 'tests/integration/helpers/helpers-test-failure.cpp'
--- tests/integration/helpers/helpers-test-failure.cpp	2016-08-12 04:03:19 +0000
+++ tests/integration/helpers/helpers-test-failure.cpp	2016-08-17 13:56:36 +0000
@@ -65,6 +65,12 @@
     ASSERT_FALSE(user_folder_uuid.isEmpty());
     qDebug() << "User folder UUID is:" << user_folder_uuid;
 
+    QFile helper_mark(SIMPLE_HELPER_MARK_FILE_PATH);
+    qDebug() << "Helper mark exists before calling StartBackup..." << helper_mark.exists();
+
+    // let's leave things clean
+    EXPECT_TRUE(removeHelperMarkBeforeStarting());
+
     // Now we know the music folder uuid, let's start the backup for it.
     QDBusReply<void> backup_reply = user_iface->call("StartBackup", QStringList{user_folder_uuid});
     ASSERT_TRUE(backup_reply.isValid()) << qPrintable(QDBusConnection::sessionBus().lastError().message());

=== modified file 'tests/integration/helpers/test-helpers-base.cpp'
--- tests/integration/helpers/test-helpers-base.cpp	2016-08-12 04:14:18 +0000
+++ tests/integration/helpers/test-helpers-base.cpp	2016-08-17 13:56:36 +0000
@@ -77,6 +77,9 @@
 
 void TestHelpersBase::SetUp()
 {
+    // let's leave things clean
+    EXPECT_TRUE(removeHelperMarkBeforeStarting());
+
     Helper::registerMetaTypes();
 
     /* Click DB test mode */
@@ -410,6 +413,7 @@
     // TODO create a new mock for upstart that controls the lifecycle of the
     // helper process so we can do this in a cleaner way.
     QFile helper_mark(SIMPLE_HELPER_MARK_FILE_PATH);
+    qDebug() << "Helper mark exists before waiting..." << helper_mark.exists();
     QElapsedTimer timer;
     timer.start();
     auto times_to_wait = times;

=== modified file 'tests/unit/helper/CMakeLists.txt'
--- tests/unit/helper/CMakeLists.txt	2016-07-31 17:20:13 +0000
+++ tests/unit/helper/CMakeLists.txt	2016-08-17 13:56:36 +0000
@@ -33,10 +33,10 @@
   Qt5::Test
 )
 
-add_test(
-  NAME ${SPEED_TEST}
-  COMMAND ${SPEED_TEST}
-)
+#add_test(
+#  NAME ${SPEED_TEST}
+#  COMMAND ${SPEED_TEST}
+#)
 
 #
 #