mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-19 06:11:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4583 from flatpak/make-test-logs-prettier

Browse Source 
Make test suite logs prettier
This commit is contained in:
Phaedrus Leeds
2021-11-16 12:21:09 -08:00
committed by GitHub
parent d23793294d 388c23cfc5
commit 5c5e73eaa9
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/flatpak-cli-transaction.c
View File

@@ -124,7 +124,7 @@ add_new_remote (FlatpakTransaction *transaction,
if (self->disable_interaction)
{
g_print (_("Configuring %s as new remote '%s'"), url, remote_name);
g_print (_("Configuring %s as new remote '%s'\n"), url, remote_name);
return TRUE;
}
@@ -397,7 +397,7 @@ progress_changed_cb (FlatpakTransactionProgress *progress,
g_print ("\r%s", str->str); /* redraw failed, just update the progress */
}
else
g_print ("\n%s", str->str);
g_print ("%s\n", str->str);
}
static void
@@ -455,7 +455,7 @@ new_operation (FlatpakTransaction *transaction,
redraw (self);
}
else
g_print ("\n%-*s", self->table_width, text);
g_print ("%s\n", text);
g_free (self->progress_msg);
self->progress_msg = g_steal_pointer (&text);
@@ -509,7 +509,7 @@ operation_error (FlatpakTransaction *transaction,
redraw (self);
}
else
g_print ("\n%-*s\n", self->table_width, msg); /* override progress, and go to next line */
g_print ("%s\n", msg);
return TRUE;
}
@@ -548,7 +548,7 @@ operation_error (FlatpakTransaction *transaction,
redraw (self);
}
else
g_printerr ("\n%-*s\n", self->table_width, text);
g_printerr ("%s\n", text);
if (!non_fatal && self->stop_on_first_error)
return FALSE;
@@ -1066,7 +1066,7 @@ message_handler (const gchar *log_domain,
redraw (self);
}
else
g_print ("\n%-*s\n", self->table_width, text);
g_print ("%s\n", text);
}
static gboolean
@@ -1428,7 +1428,7 @@ flatpak_cli_transaction_run (FlatpakTransaction *transaction,
redraw (self);
}
else
g_print ("\n%-*s", self->table_width, text);
g_print ("%s", text);
g_print ("\n");
}

4
tests/libtest.sh
View File

@@ -18,6 +18,10 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# redirect stdout to stderr, otherwise the log will have command output out of
# order with xtrace output
exec 2>&1
if [ -n "${G_TEST_SRCDIR:-}" ]; then
test_srcdir="${G_TEST_SRCDIR}"
else