Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set default formatting of Pint units to use symbols, not names #2736

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Set default formatting of Pint units to use symbols, not names #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8359f8
Set default formatting of Pint units to use symbols, not names
happz Mar 5, 2024
8052694
squash: fixing tests
happz Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions tests/provision/virtual.testcloud/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ rlJournalStart
if ! rlRun "tmt run -i $run --scratch"; then
rlRun "cat $run/log.txt" 0 "Dump log.txt"
else
rlAssertGrep "memory: 2048 megabyte" "$run/log.txt"
rlAssertGrep "disk: 10 gigabyte" "$run/log.txt"
rlAssertGrep "effective hardware: variant #1: memory: == 2048 megabyte" "$run/log.txt"
rlAssertGrep "effective hardware: variant #1: disk.size: == 10 gigabyte" "$run/log.txt"
rlAssertGrep "memory: set to '2048 megabyte' because of 'memory: == 2048 megabyte'" "$run/log.txt"
rlAssertGrep "disk\\[0\\].size: set to '10 gigabyte' because of 'disk.size: == 10 gigabyte'" "$run/log.txt"
rlAssertGrep "memory: 2048 MB" "$run/log.txt"
rlAssertGrep "disk: 10 GB" "$run/log.txt"
rlAssertGrep "effective hardware: variant #1: memory: == 2048 MB" "$run/log.txt"
rlAssertGrep "effective hardware: variant #1: disk.size: == 10 GB" "$run/log.txt"
rlAssertGrep "memory: set to '2048 MB' because of 'memory: == 2048 MB'" "$run/log.txt"
rlAssertGrep "disk\\[0\\].size: set to '10 GB' because of 'disk.size: == 10 GB'" "$run/log.txt"
rlAssertGrep "final domain memory: 2048000" "$run/log.txt"
rlAssertGrep "final domain disk size: 10" "$run/log.txt"
fi
Expand All @@ -40,12 +40,12 @@ rlJournalStart
--connection system" ; then
rlRun "cat $run/log.txt" 0 "Dump log.txt"
else
rlAssertGrep "memory: 2049 megabyte" "$run/log.txt"
rlAssertGrep "disk: 11 gigabyte" "$run/log.txt"
rlAssertGrep "effective hardware: variant #1: memory: == 2049 megabyte" "$run/log.txt"
rlAssertGrep "effective hardware: variant #1: disk.size: == 11 gigabyte" "$run/log.txt"
rlAssertGrep "memory: set to '2049 megabyte' because of 'memory: == 2049 megabyte'" "$run/log.txt"
rlAssertGrep "disk\\[0\\].size: set to '11 gigabyte' because of 'disk.size: == 11 gigabyte'" "$run/log.txt"
rlAssertGrep "memory: 2049 MB" "$run/log.txt"
rlAssertGrep "disk: 11 GB" "$run/log.txt"
rlAssertGrep "effective hardware: variant #1: memory: == 2049 MB" "$run/log.txt"
rlAssertGrep "effective hardware: variant #1: disk.size: == 11 GB" "$run/log.txt"
rlAssertGrep "memory: set to '2049 MB' because of 'memory: == 2049 MB'" "$run/log.txt"
rlAssertGrep "disk\\[0\\].size: set to '11 GB' because of 'disk.size: == 11 GB'" "$run/log.txt"
rlAssertGrep "final domain memory: 2049000" "$run/log.txt"
rlAssertGrep "final domain disk size: 11" "$run/log.txt"
fi
Expand Down
3 changes: 3 additions & 0 deletions tmt/hardware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
#: Unit registry, used and shared by all code.
UNITS = pint.UnitRegistry()

# The default formatting should use unit symbols rather than full names.
UNITS.default_format = '~'


# Special type variable, used in `Constraint.from_specification` - we bound this return value to
# always be a subclass of `Constraint` class, instead of just any class in general.
Expand Down
Loading