Skip to content

Commit

Permalink
Testsuite-found fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo committed Sep 14, 2024
1 parent 97c0db3 commit 8e69626
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
5 changes: 4 additions & 1 deletion src/alire/alire-index-search.adb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ package body Alire.Index.Search is
Busy : Simple_Logging.Ongoing :=
Simple_Logging.Activity ("Searching");
begin
Table.Header ("NAME").Header ("DESCRIPTION");
-- Preserve old behavior for human output
if Utils.Tables.Structured_Output then
Table.Header ("NAME").Header ("DESCRIPTION");
end if;

for Crate of Alire.Index.All_Crates.all loop
if Lookup = "" or else
Expand Down
5 changes: 4 additions & 1 deletion src/alire/alire-solutions.adb
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,10 @@ package body Alire.Solutions is
Trace.Always ("There are no pins");
end if;
else
Table.Header ("Crate").Header ("Target").Header ("Origin").New_Row;
-- To preserve old behavior with human output
if Utils.Tables.Structured_Output then
Table.Header ("Crate").Header ("Target").Header ("Origin").New_Row;
end if;

for Dep of This.Dependencies loop
if Dep.Is_Linked then
Expand Down
6 changes: 2 additions & 4 deletions testsuite/tests/pin/branch/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
"""

from drivers.alr import run_alr, alr_pin, alr_unpin, init_local_crate
from drivers.asserts import assert_eq, assert_match
from drivers.helpers import git_branch, git_head, init_git_repo
from drivers.asserts import assert_match
from drivers.helpers import git_branch, init_git_repo
from e3.os.fs import touch
from re import escape

import re
import os
import shutil
import subprocess

# "remote" is going to be the remote crate
Expand Down

0 comments on commit 8e69626

Please sign in to comment.