Fixes #16577 - enhance unit detection #3854
Conversation
| test '#to_gb non matching string raises exception with correct message' do | ||
| value = 'something that is not matched' | ||
| exception = assert_raises(RuntimeError) { value.to_gb } | ||
| assert exception.message =~ /^Unknown string/, "wrong exception reason #{exception.to_s}" |
There was a problem hiding this comment.
Redundant use of Object#to_s in interpolation.
| @@ -140,17 +140,20 @@ def to_translation | |||
| end | |||
|
|
|||
| def to_gb | |||
| value, _, unit=self.match(/(\d+(\.\d+)?) ?(([KMGT]i?B?|B))$/i)[1..3] | |||
There was a problem hiding this comment.
this used to fail, #match return nil if there's no match and we called [1..3] on it
| @@ -140,17 +140,20 @@ def to_translation | |||
| end | |||
|
|
|||
| def to_gb | |||
| value, _, unit=self.match(/(\d+(\.\d+)?) ?(([KMGT]i?B?|B))$/i)[1..3] | |||
| match_data = self.match(/(\d+(\.\d+)?) ?(([KMGT]i?B?|B|Bytes))$/i) | |||
There was a problem hiding this comment.
Shouldn't the match start at the start of the string?
There was a problem hiding this comment.
I didn't want to mix refactorings with fix since I thought this should be merged into 1.13 but since it was rejected I can fix existing code.
| value, _, unit = match_data[1..3] | ||
| else | ||
| raise "Unknown string: #{self.inspect}!" | ||
| end | ||
| case unit.to_sym |
There was a problem hiding this comment.
we use case insensitive matching, so for example "10gb" will be caught, but there is no :gb symbol - perhaps .lower.to_sym?
There was a problem hiding this comment.
alright, even though gB is not gb
There was a problem hiding this comment.
technically GiB isn't the same as GB either, but we ignore that as well :)
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
thanks @tbrisker, I made changes you requested, could you take another look? |
|
[test foreman] |
|
[test foreman] |
No description provided.