[geary] Merge branch 'wip/remove-ci-test-workaround' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit ef8f97628e9ef0acf9747137837bd8dd455d9125
Author: Michael Gratton <mike vee net>
Date:   Tue Apr 9 06:11:10 2019 +0000

    Merge branch 'wip/remove-ci-test-workaround' into 'mainline'
    
    Remove CI test workaround
    
    See merge request GNOME/geary!198
    
    (cherry picked from commit 8654c7ae136d2467f7b5b2e85a436d9039bd64bc)
    
    4fc688de Revert "Work around DB tests always failing on gcc150.osuosl.org CI runner"
    6b4b598a Add test runner multiplier to account for slow CI runners

 .gitlab-ci.yml        |  9 +++++++--
 test/test-engine.vala | 24 +++++++-----------------
 2 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b359baad..be8902da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,11 +8,16 @@ variables:
   # Flatpak CI vars
   BUNDLE: geary-dev.flatpak
 
+  # ImapDB and other tests that touch the disk are super slow on CI
+  # runners like gcc150.osuosl.org that use platter drives still.
+  # See Infrastructure/Infrastructure#97.
+  TEST_ARGS: -t 10
+
   # Build
   BUILD_DIR: build
   CONFIG_CMD: meson --buildtype=debug build
   BUILD_CMD: ninja -v -C $BUILD_DIR
-  TEST_CMD: xvfb-run meson test -v --no-stdsplit -C $BUILD_DIR
+  TEST_CMD: xvfb-run meson test -v --no-stdsplit -C $BUILD_DIR $TEST_ARGS
   INSTALL_CMD: ninja -v -C $BUILD_DIR install
 
   # Fedora packages
@@ -69,7 +74,7 @@ flatpak:
     MANIFEST_PATH: org.gnome.Geary.json
     MESON_ARGS: "-Dprofile=Devel"
     RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
-    TEST_BUILD_ARGS: "--env=CI_RUNNER_DESCRIPTION=${CI_RUNNER_DESCRIPTION}"
+    TEST_RUN_ARGS: $TEST_ARGS
   extends: .flatpak
 
 review:
diff --git a/test/test-engine.vala b/test/test-engine.vala
index cb8cd237..6a9a17a2 100644
--- a/test/test-engine.vala
+++ b/test/test-engine.vala
@@ -22,12 +22,6 @@ int main(string[] args) {
 
     TestSuite engine = new TestSuite("engine");
 
-    // 😢 https://gitlab.gnome.org/Infrastructure/Infrastructure/issues/97
-    bool disable_db_tests = (
-        GLib.Environment.get_variable("CI_RUNNER_DESCRIPTION") ==
-        "gcc150.osuosl.org"
-    );
-
     engine.add_suite(new Geary.AccountInformationTest().get_suite());
     engine.add_suite(new Geary.AttachmentTest().get_suite());
     engine.add_suite(new Geary.EngineTest().get_suite());
@@ -41,10 +35,8 @@ int main(string[] args) {
     engine.add_suite(new Geary.App.ConversationMonitorTest().get_suite());
     engine.add_suite(new Geary.Ascii.Test().get_suite());
     engine.add_suite(new Geary.ConfigFileTest().get_suite());
-    if (!disable_db_tests) {
-        engine.add_suite(new Geary.Db.DatabaseTest().get_suite());
-        engine.add_suite(new Geary.Db.VersionedDatabaseTest().get_suite());
-    }
+    engine.add_suite(new Geary.Db.DatabaseTest().get_suite());
+    engine.add_suite(new Geary.Db.VersionedDatabaseTest().get_suite());
     engine.add_suite(new Geary.HTML.UtilTest().get_suite());
     // Other IMAP tests rely on DataFormat working, so test that first
     engine.add_suite(new Geary.Imap.DataFormatTest().get_suite());
@@ -54,13 +46,11 @@ int main(string[] args) {
     engine.add_suite(new Geary.Imap.ListParameterTest().get_suite());
     engine.add_suite(new Geary.Imap.MailboxSpecifierTest().get_suite());
     engine.add_suite(new Geary.Imap.NamespaceResponseTest().get_suite());
-    if (!disable_db_tests) {
-        engine.add_suite(new Geary.ImapDB.AccountTest().get_suite());
-        engine.add_suite(new Geary.ImapDB.AttachmentTest().get_suite());
-        engine.add_suite(new Geary.ImapDB.AttachmentIoTest().get_suite());
-        engine.add_suite(new Geary.ImapDB.DatabaseTest().get_suite());
-        engine.add_suite(new Geary.ImapDB.FolderTest().get_suite());
-    }
+    engine.add_suite(new Geary.ImapDB.AccountTest().get_suite());
+    engine.add_suite(new Geary.ImapDB.AttachmentTest().get_suite());
+    engine.add_suite(new Geary.ImapDB.AttachmentIoTest().get_suite());
+    engine.add_suite(new Geary.ImapDB.DatabaseTest().get_suite());
+    engine.add_suite(new Geary.ImapDB.FolderTest().get_suite());
     engine.add_suite(new Geary.ImapEngine.AccountProcessorTest().get_suite());
     engine.add_suite(new Geary.Inet.Test().get_suite());
     engine.add_suite(new Geary.JS.Test().get_suite());