Thread (6 messages) 6 messages, 2 authors, 2024-11-18

Re: [PATCH v2] t9101: Refactor test_expect_success format

From: Seyi Chamber <hidden>
Date: 2024-11-18 08:34:59

On Sat, 2 Nov 2024 at 11:28, Seyi Kuforiji [off-list ref] wrote:
quoted hunk ↗ jump to hunk
The current script uses an outdated formatting style for
test_expect_success blocks, where each argument is separated by a
backslash and newline. This style can lead to readability issues and
makes it harder to maintain the script.The modern style consolidates the
multi-line command arguments into a single quoted block, which improves
readability, maintainability, and aligns the code with current coding
standards.

Signed-off-by: Seyi Kuforiji <redacted>
---
 t/t9101-git-svn-props.sh | 48 ++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index b2ee626b9a..792f7896e4 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -73,12 +73,13 @@ test_expect_success 'initialize git svn' 'git svn init "$svnrepo"'
 test_expect_success 'fetch revisions from svn' 'git svn fetch'

 name='test svn:keywords ignoring'
-test_expect_success "$name" \
-       'git checkout -b mybranch remotes/git-svn &&
+test_expect_success "$name" '
+       git checkout -b mybranch remotes/git-svn &&
        echo Hi again >>kw.c &&
        git commit -a -m "test keywords ignoring" &&
        git svn set-tree remotes/git-svn..mybranch &&
-       git pull . remotes/git-svn'
+       git pull . remotes/git-svn
+'

 expect='/* $Id$ */'
 got="$(sed -ne 2p kw.c)"
@@ -94,10 +95,11 @@ test_expect_success "propset CR on crlf files" '
         )
 '

-test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
-       'git svn fetch &&
-        git pull . remotes/git-svn &&
-        svn_cmd co "$svnrepo" new_wc'
+test_expect_success 'fetch and pull latest from svn and checkout a new wc' '
+       git svn fetch &&
+       git pull . remotes/git-svn &&
+       svn_cmd co "$svnrepo" new_wc
+'

 for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf
 do
@@ -110,15 +112,17 @@ cd test_wc
        printf '$Id$\rHello\rWorld' >ne_cr
        a_cr=$(printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin)
        a_ne_cr=$(printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin)
-       test_expect_success 'Set CRLF on cr files' \
-       'svn_cmd propset svn:eol-style CRLF cr &&
-        svn_cmd propset svn:eol-style CRLF ne_cr &&
-        svn_cmd propset svn:keywords Id cr &&
-        svn_cmd propset svn:keywords Id ne_cr &&
-        svn_cmd commit -m "propset CRLF on cr files"'
+       test_expect_success 'Set CRLF on cr files' '
+               svn_cmd propset svn:eol-style CRLF cr &&
+               svn_cmd propset svn:eol-style CRLF ne_cr &&
+               svn_cmd propset svn:keywords Id cr &&
+               svn_cmd propset svn:keywords Id ne_cr &&
+               svn_cmd commit -m "propset CRLF on cr files"
+       '
 cd ..
-test_expect_success 'fetch and pull latest from svn' \
-       'git svn fetch && git pull . remotes/git-svn'
+test_expect_success 'fetch and pull latest from svn' '
+       git svn fetch && git pull . remotes/git-svn
+'

 b_cr="$(git hash-object cr)"
 b_ne_cr="$(git hash-object ne_cr)"
@@ -141,7 +145,7 @@ cat >show-ignore.expect <<\EOF
 /deeply/nested/directory/no-such-file*
 EOF

-test_expect_success 'test show-ignore' "
+test_expect_success 'test show-ignore' '
        (
                cd test_wc &&
                mkdir -p deeply/nested/directory &&
@@ -155,7 +159,7 @@ no-such-file*
        ) &&
        git svn show-ignore >show-ignore.got &&
        cmp show-ignore.expect show-ignore.got
-"
+'

 cat >create-ignore.expect <<\EOF
 /no-such-file*
@@ -170,7 +174,7 @@ cat >create-ignore-index.expect <<EOF
 100644 $expectoid 0    deeply/nested/directory/.gitignore
 EOF

-test_expect_success 'test create-ignore' "
+test_expect_success 'test create-ignore' '
        git svn fetch && git pull . remotes/git-svn &&
        git svn create-ignore &&
        cmp ./.gitignore create-ignore.expect &&
@@ -179,7 +183,7 @@ test_expect_success 'test create-ignore' "
        cmp ./deeply/nested/directory/.gitignore create-ignore.expect &&
        git ls-files -s >ls_files_result &&
        grep gitignore ls_files_result | cmp - create-ignore-index.expect
-       "
+'

 cat >prop.expect <<\EOF
@@ -207,7 +211,7 @@ test_expect_success 'test propget' '
        test_propget svn:ignore nested/ ../prop.expect &&
        test_propget svn:ignore ./nested ../prop.expect &&
        test_propget svn:ignore .././deeply/nested ../prop.expect
-       '
+'

 cat >prop.expect <<\EOF
 Properties on '.':
@@ -225,12 +229,12 @@ Properties on 'nested/directory/.keep':
   svn:entry:uuid
 EOF

-test_expect_success 'test proplist' "
+test_expect_success 'test proplist' '
        git svn proplist . >actual &&
        cmp prop.expect actual &&

        git svn proplist nested/directory/.keep >actual &&
        cmp prop2.expect actual
-       "
+'

 test_done
--
2.47.0.86.g15030f9556
Hi Taylor,

I trust you're well.

I didn't get any status update on the patch I updated the commit
message, found here:
https://public-inbox.org/git/20241102102801.26432-1-kuforiji98@gmail.com/

Is it good to go?

Thanks
Seyi
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help