Fix and re-enable ctest desktop tests on x86 (#1043)

Author: dconeybe

.github/workflows/desktop.yml

@@ -234,21 +234,20 @@ jobs:
           LANG: en_US
         run: |
           cd build
-          ctest --repeat until-pass:3
+          ctest --repeat until-pass:3 --output-on-failure
 
       - name: Run unit tests (linux)
         # Linux exists as its own standalone execution step in order to invoke
         # platform-specific `ulimit` to enable crash collection.  The ulimit
         # command must be invoked in same shell instance of that runs the
         # tests.
-        # TODO: Enable tests for x86 once they are all working
-        if: startsWith(matrix.os, 'ubuntu') && matrix.architecture != 'x86'
+        if: startsWith(matrix.os, 'ubuntu')
         env:
           LANG: en_US
         run: |
           ulimit -c unlimited
           cd build
-          sudo ctest --repeat until-pass:3
+          sudo ctest --repeat until-pass:3 --output-on-failure
 
       - name: Prep bins for achive (linux)
         # Copies all of the binary files into one directory for ease in

app/tests/time_test.cc

@@ -18,6 +18,9 @@
 
 #include <time.h>
 
+#include <iostream>
+#include <string>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
@@ -86,11 +89,8 @@ TEST(TimeTests, GetTimestampEpochTest) {
 
   // Print out the epoch time so that we can verify the timestamp from the log
   // This is the easiest way to verify if the function works in all platform
-#ifdef __linux__
-  printf("%lu -> %lu (%ld)\n", start, end, error);
-#else
-  printf("%llu -> %llu (%lld)\n", start, end, error);
-#endif  // __linux__
+  std::cout << std::to_string(start) << " -> " << std::to_string(end) << " ("
+            << std::to_string(error) << ")" << std::endl;
 
   EXPECT_GE(end, start + 500);
 }

database/tests/desktop/core/server_values_test.cc

@@ -37,7 +37,7 @@ TEST(ServerValues, ServerTimestamp) {
 }
 
 TEST(ServerValues, GenerateServerValues) {
-  int64_t current_time_ms = time(nullptr) * 1000;
+  int64_t current_time_ms = static_cast<int64_t>(time(nullptr)) * 1000L;
 
   Variant result = GenerateServerValues(0);
 
@@ -50,7 +50,7 @@ TEST(ServerValues, GenerateServerValues) {
 }
 
 TEST(ServerValues, GenerateServerValuesWithTimeOffset) {
-  int64_t current_time_ms = time(nullptr) * 1000;
+  int64_t current_time_ms = static_cast<int64_t>(time(nullptr)) * 1000L;
 
   Variant result = GenerateServerValues(5000);
 
@@ -160,7 +160,7 @@ TEST(ServerValues, ResolveDeferredValueNestedMap) {
 }
 
 TEST(ServerValues, ResolveDeferredValueTimestamp) {
-  int64_t current_time_ms = time(nullptr) * 1000;
+  int64_t current_time_ms = static_cast<int64_t>(time(nullptr)) * 1000L;
   Variant timestamp = ServerTimestamp();
   Variant server_values = GenerateServerValues(0);
 
@@ -171,7 +171,7 @@ TEST(ServerValues, ResolveDeferredValueTimestamp) {
 }
 
 TEST(ServerValues, ResolveDeferredValueSnapshot) {
-  int64_t current_time_ms = time(nullptr) * 1000;
+  int64_t current_time_ms = static_cast<int64_t>(time(nullptr)) * 1000L;
   Variant nested_map_variant = std::map<Variant, Variant>{
       std::make_pair("aaa", 100),
       std::make_pair("bbb", 200),
@@ -196,7 +196,7 @@ TEST(ServerValues, ResolveDeferredValueSnapshot) {
 }
 
 TEST(ServerValues, ResolveDeferredValueMerge) {
-  int64_t current_time_ms = time(nullptr) * 1000;
+  int64_t current_time_ms = static_cast<int64_t>(time(nullptr)) * 1000L;
   Variant merge(std::map<Variant, Variant>{
       std::make_pair("aaa", 100),
       std::make_pair("bbb", 200),