[geary/wip/remove-ci-test-workaround] Revert "Work around DB tests always failing on gcc150.osuosl.org CI runner"



commit 4fc688de1254906279e2f55c447265ccb15a29c4
Author: Michael James Gratton <mike vee net>
Date:   Tue Mar 26 16:44:37 2019 +1100

    Revert "Work around DB tests always failing on gcc150.osuosl.org CI runner"
    
    This reverts commit b3b44ccd423e45da3cfeb0b2d077c2baff27c1cd.

 test/test-engine.vala | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)
---
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());


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]