Commit 7899fff8 authored by Michael Gratton's avatar Michael Gratton 🤞

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

Remove CI test workaround

See merge request !198

(cherry picked from commit 8654c7ae)

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
parent e28b5bb2
Pipeline #96231 passed with stages
in 18 minutes and 57 seconds
......@@ -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
......@@ -81,7 +86,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:
......
......@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment