<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/8a8715359262cf75cbd245fa4e6361b440a35b77">https://github.com/macports/macports-base/commit/8a8715359262cf75cbd245fa4e6361b440a35b77</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8a8715359 portlint.test: prefer lsearch -glob
</span>8a8715359 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8a8715359262cf75cbd245fa4e6361b440a35b77
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jun 21 10:52:48 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> portlint.test: prefer lsearch -glob
</span>---
src/port1.0/tests/portlint.test | 66 ++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portlint.test b/src/port1.0/tests/portlint.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f8eca46f..272a7213d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portlint.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portlint.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +40,8 @@ test test_lint_checksum_type_list_missing_recommended {
</span> return "FAIL: unexpected results: no results returned"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {"size" ni $results} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: no mention of the missing size field"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *size*] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: no mention of the missing size field: $results"
</span> }
return "lint_checksum_type_list_missing_recommended passed"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,11 +57,11 @@ test test_lint_checksum_type_list_deprecated_md5 {
</span> return "FAIL: unexpectedly encountered no results"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $results {insecure.+md5}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *insecure*md5*] == -1} {
</span> return "FAIL: expecting deprecation warning for using MD5 solely"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $results {missing.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *missing*recommended*] == -1} {
</span> return "FAIL: expecting warnings about missing recommended checksum\
types"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,11 +79,11 @@ test test_lint_checksum_type_list_deprecated_sha1 {
</span> return "FAIL: unexpected results: no results returned"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $results {insecure.+sha1}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *insecure*sha1*] == -1} {
</span> return "FAIL: no mention of the deprecated sha1 field"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $results {missing.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *missing*recommended*] == -1} {
</span> return "FAIL: expecting warnings about missing recommended checksum\
types"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +102,7 @@ test test_lint_checksum_type_list_mixed {
</span> return "FAIL: unexpected results: no results returned"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $results {missing.+rmd160}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *missing*rmd160*] == -1} {
</span> return "FAIL: no mention of missing recommended rmd160 field: $results"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,13 +128,13 @@ test test_lint_checksum_basic {
</span> }
if {[llength $warnings] > 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $warnings {missing.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $warnings *missing*recommended*] == -1} {
</span> return "FAIL: missing expected warning about recommended fields"
}
if {[llength [lsearch -inline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -regexp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -all $warnings {missing.+recommended}]] != 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -glob \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -all $warnings *missing*recommended*]] != 2} {
</span> return "FAIL: less warnings than expected: $warnings"
}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,15 +163,15 @@ test test_lint_checksum_basic_w_filename {
</span> }
if {[llength $warnings] > 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $warnings \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {doop\.tgz.+missing.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $warnings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *doop.tgz*missing*recommended*] == -1} {
</span> return "FAIL: missing expected warning about recommended fields"
}
if {[llength [lsearch -inline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -regexp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -glob \
</span> -all $warnings \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {doop\.tgz.+missing.+recommended}]] != 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *doop.tgz*missing*recommended*]] != 2} {
</span> return "FAIL: less warnings than expected: $warnings"
}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,7 +261,7 @@ test test_lint_checksum_bad_checksum_type {
</span> return "FAIL: unexpectedly encountered no errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {invalid.+sha300}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *invalid*sha300*] == -1} {
</span> return "FAIL: no error present about the invalid checksum type: $errors"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -292,7 +292,7 @@ test test_lint_checksum_bad_checksum_type_w_filename {
</span> return "FAIL: unexpectedly encountered no errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {invalid.+field}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *invalid*field*] == -1} {
</span> return "FAIL: no error present about the invalid checksum type: $errors"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,15 +313,15 @@ test test_lint_checksum_multi_basic {
</span> return "FAIL: invalid results returned: empty list"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $results {file1\.tar.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *file1.tar*recommended*] == -1} {
</span> return "FAIL: no expected warnings for file1: $results"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $results {file2\.tar.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *file2.tar*recommended*] == -1} {
</span> return "FAIL: no expected warnings for file2: $results"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $results {file3\.tar.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $results *file3.tar*recommended*] == -1} {
</span> return "FAIL: no expected warnings for file3: $results"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,7 +383,7 @@ test test_lint_checksum_malformed_sha256 {
</span> return "FAIL: unexpectedly encountered errors: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {checksum.+sha256.+invalid}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *checksum*sha256*invalid*] == -1} {
</span> return "FAIL: missing error about invalid checksum: $errors"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -408,7 +408,7 @@ test test_lint_checksum_malformed_rmd160 {
</span> return "FAIL: unexpectedly encountered errors: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {checksum.+rmd160.+invalid}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *checksum*rmd160*invalid*] == -1} {
</span> return "FAIL: missing error about invalid checksum: $errors"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,7 +433,7 @@ test test_lint_checksum_malformed_size {
</span> return "FAIL: unexpectedly encountered errors: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {checksum.+size.+invalid}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *checksum*size*invalid*] == -1} {
</span> return "FAIL: missing error about invalid checksum: $errors"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -459,7 +459,7 @@ test test_lint_checksum_multi_malformed {
</span> return "FAIL: unexpectedly encountered errors: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {checksum.+sha256.+invalid}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *checksum*sha256*invalid*] == -1} {
</span> return "FAIL: missing error about invalid checksum: $errors"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -490,11 +490,11 @@ test test_lint_checksum_multi_malformed_w_filename_1 {
</span> return "FAIL: unexpectedly encountered no warnings"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {somefile.+checksum.+sha256.+invalid}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *somefile*checksum*sha256*invalid*] == -1} {
</span> return "FAIL: missing error about invalid checksum: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $warnings {missing.+recommended.+rmd160}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $warnings *missing*recommended*rmd160*] == -1} {
</span> return "FAIL: missing expected warning about missing recommended type"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -529,11 +529,11 @@ test test_lint_checksum_multi_malformed_w_filename_2 {
</span> return "FAIL: unexpectedly encountered no warnings"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {somefile.+checksum.+sha256.+invalid}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *somefile*checksum*sha256*invalid*] == -1} {
</span> return "FAIL: missing error about invalid checksum: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $warnings {somefile.+missing.+recommended.+rmd160}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $warnings *somefile*missing*recommended*rmd160*] == -1} {
</span> return "FAIL: missing warnings about missing recommended type"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -564,11 +564,11 @@ test test_lint_checksum_multi_adjacent_invalid_w_filename {
</span> return "FAIL: unexpectedly encountered errors: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {invalid.+field.+nope}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *invalid*field*nope*] == -1} {
</span> return "FAIL: missing error about invalid checksum field: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $warnings {somefile.+missing.+recommended.+rmd160}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $warnings *somefile*missing*recommended*rmd160*] == -1} {
</span> return "FAIL: missing warnings about missing recommended type: rmd160"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -598,11 +598,11 @@ test test_lint_checksum_invalid_ending {
</span> return "FAIL: unexpectedly encountered no warnings"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {invalid.+field.+bunny}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *invalid*field*bunny*] == -1} {
</span> return "FAIL: missing error about invalid checksum field: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $warnings {missing.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $warnings *missing*recommended*] == -1} {
</span> return "FAIL: no warnings about missing recommended types: $warnings"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -634,11 +634,11 @@ test test_lint_checksum_invalid_ending_w_filename {
</span> return "FAIL: unexpectedly encountered no warnings"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $errors {invalid.+bunny}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $errors *invalid*bunny*] == -1} {
</span> return "FAIL: missing error about invalid field: $errors"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -regexp $warnings {file1.+missing.+recommended}] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch -glob $warnings *file1*missing*recommended*] == -1} {
</span> return "FAIL: no warnings about missing recommended types: $warnings"
}
</pre><pre style='margin:0'>
</pre>