mirror of https://github.com/minio/minio.git
update-notifier.go: misleading version age message (#17750)
This commit is contained in:
parent
684c46369c
commit
49a1e2f98e
|
@ -39,7 +39,7 @@ func prepareUpdateMessage(downloadURL string, older time.Duration) string {
|
||||||
// Compute friendly duration string to indicate time
|
// Compute friendly duration string to indicate time
|
||||||
// difference between newer and current release.
|
// difference between newer and current release.
|
||||||
t := time.Time{}
|
t := time.Time{}
|
||||||
newerThan := humanize.RelTime(t, t.Add(older), "ago", "")
|
newerThan := humanize.RelTime(t, t.Add(older), "before the latest release", "")
|
||||||
|
|
||||||
if globalCLIContext.JSON {
|
if globalCLIContext.JSON {
|
||||||
return fmt.Sprintf("You are running an older version of MinIO released %s, update: %s", newerThan, downloadURL)
|
return fmt.Sprintf("You are running an older version of MinIO released %s, update: %s", newerThan, downloadURL)
|
||||||
|
|
|
@ -35,36 +35,36 @@ func TestPrepareUpdateMessage(t *testing.T) {
|
||||||
expectedSubStr string
|
expectedSubStr string
|
||||||
}{
|
}{
|
||||||
// Testcase index 0
|
// Testcase index 0
|
||||||
{72 * time.Hour, "my_download_url", "3 days ago"},
|
{72 * time.Hour, "my_download_url", "3 days before the latest release"},
|
||||||
{3 * time.Hour, "https://my_download_url_is_huge/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "3 hours ago"},
|
{3 * time.Hour, "https://my_download_url_is_huge/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "3 hours before the latest release"},
|
||||||
{-72 * time.Hour, "another_update_url", ""},
|
{-72 * time.Hour, "another_update_url", ""},
|
||||||
{0, "another_update_url", ""},
|
{0, "another_update_url", ""},
|
||||||
{time.Hour, "", ""},
|
{time.Hour, "", ""},
|
||||||
{0 * time.Second, "my_download_url", "now"},
|
{0 * time.Second, "my_download_url", "now"},
|
||||||
{1 * time.Second, "my_download_url", "1 second ago"},
|
{1 * time.Second, "my_download_url", "1 second before the latest release"},
|
||||||
{37 * time.Second, "my_download_url", "37 seconds ago"},
|
{37 * time.Second, "my_download_url", "37 seconds before the latest release"},
|
||||||
{60 * time.Second, "my_download_url", "1 minute ago"},
|
{60 * time.Second, "my_download_url", "1 minute before the latest release"},
|
||||||
{61 * time.Second, "my_download_url", "1 minute ago"},
|
{61 * time.Second, "my_download_url", "1 minute before the latest release"},
|
||||||
|
|
||||||
// Testcase index 10
|
// Testcase index 10
|
||||||
{37 * time.Minute, "my_download_url", "37 minutes ago"},
|
{37 * time.Minute, "my_download_url", "37 minutes before the latest release"},
|
||||||
{1 * time.Hour, "my_download_url", "1 hour ago"},
|
{1 * time.Hour, "my_download_url", "1 hour before the latest release"},
|
||||||
{61 * time.Minute, "my_download_url", "1 hour ago"},
|
{61 * time.Minute, "my_download_url", "1 hour before the latest release"},
|
||||||
{122 * time.Minute, "my_download_url", "2 hours ago"},
|
{122 * time.Minute, "my_download_url", "2 hours before the latest release"},
|
||||||
{24 * time.Hour, "my_download_url", "1 day ago"},
|
{24 * time.Hour, "my_download_url", "1 day before the latest release"},
|
||||||
{25 * time.Hour, "my_download_url", "1 day ago"},
|
{25 * time.Hour, "my_download_url", "1 day before the latest release"},
|
||||||
{49 * time.Hour, "my_download_url", "2 days ago"},
|
{49 * time.Hour, "my_download_url", "2 days before the latest release"},
|
||||||
{7 * 24 * time.Hour, "my_download_url", "1 week ago"},
|
{7 * 24 * time.Hour, "my_download_url", "1 week before the latest release"},
|
||||||
{8 * 24 * time.Hour, "my_download_url", "1 week ago"},
|
{8 * 24 * time.Hour, "my_download_url", "1 week before the latest release"},
|
||||||
{15 * 24 * time.Hour, "my_download_url", "2 weeks ago"},
|
{15 * 24 * time.Hour, "my_download_url", "2 weeks before the latest release"},
|
||||||
|
|
||||||
// Testcase index 20
|
// Testcase index 20
|
||||||
{30 * 24 * time.Hour, "my_download_url", "1 month ago"},
|
{30 * 24 * time.Hour, "my_download_url", "1 month before the latest release"},
|
||||||
{31 * 24 * time.Hour, "my_download_url", "1 month ago"},
|
{31 * 24 * time.Hour, "my_download_url", "1 month before the latest release"},
|
||||||
{61 * 24 * time.Hour, "my_download_url", "2 months ago"},
|
{61 * 24 * time.Hour, "my_download_url", "2 months before the latest release"},
|
||||||
{360 * 24 * time.Hour, "my_download_url", "1 year ago"},
|
{360 * 24 * time.Hour, "my_download_url", "1 year before the latest release"},
|
||||||
{361 * 24 * time.Hour, "my_download_url", "1 year ago"},
|
{361 * 24 * time.Hour, "my_download_url", "1 year before the latest release"},
|
||||||
{2 * 365 * 24 * time.Hour, "my_download_url", "2 years ago"},
|
{2 * 365 * 24 * time.Hour, "my_download_url", "2 years before the latest release"},
|
||||||
}
|
}
|
||||||
|
|
||||||
plainMsg := "You are running an older version of MinIO released"
|
plainMsg := "You are running an older version of MinIO released"
|
||||||
|
|
Loading…
Reference in New Issue