From ca83f782b8bb6ecba0d750849a6b1fc28ec116e2 Mon Sep 17 00:00:00 2001
From: Nick Mitchell <nickm@us.ibm.com>
Date: Tue, 26 Nov 2024 10:58:51 -0500
Subject: [PATCH] test: simplify dir structure of python-code-code-quality

Signed-off-by: Nick Mitchell <nickm@us.ibm.com>
---
 pkg/runtime/needs/install_requirements.go     |   1 +
 .../pail/{src => }/main.py                    |   0
 .../pail/{data => }/requirements.txt          |   0
 .../test-data/expected/sample_1.parquet.gz    | Bin 1630 -> 1526 bytes
 .../test-data/expected/sample_2.parquet.gz    | Bin 1714 -> 1607 bytes
 tests/tests/python-code-code-quality/post.sh  |   4 ++--
 6 files changed, 3 insertions(+), 2 deletions(-)
 rename tests/tests/python-code-code-quality/pail/{src => }/main.py (100%)
 rename tests/tests/python-code-code-quality/pail/{data => }/requirements.txt (100%)

diff --git a/pkg/runtime/needs/install_requirements.go b/pkg/runtime/needs/install_requirements.go
index 5b97df46..d0ed4e8a 100644
--- a/pkg/runtime/needs/install_requirements.go
+++ b/pkg/runtime/needs/install_requirements.go
@@ -92,6 +92,7 @@ pip3 install %s %s -r %s %s 1>&2`, venvPath, venvPath, verboseFlag, nocache, qui
 	cmd = exec.CommandContext(ctx, "/bin/bash", "-c", cmds)
 	cmd.Dir = filepath.Dir(venvPath)
 	if verbose {
+		// Stderr so as not to collide with lunchpail pipeline stdout
 		cmd.Stdout = os.Stderr
 	}
 	cmd.Stderr = os.Stderr
diff --git a/tests/tests/python-code-code-quality/pail/src/main.py b/tests/tests/python-code-code-quality/pail/main.py
similarity index 100%
rename from tests/tests/python-code-code-quality/pail/src/main.py
rename to tests/tests/python-code-code-quality/pail/main.py
diff --git a/tests/tests/python-code-code-quality/pail/data/requirements.txt b/tests/tests/python-code-code-quality/pail/requirements.txt
similarity index 100%
rename from tests/tests/python-code-code-quality/pail/data/requirements.txt
rename to tests/tests/python-code-code-quality/pail/requirements.txt
diff --git a/tests/tests/python-code-code-quality/pail/test-data/expected/sample_1.parquet.gz b/tests/tests/python-code-code-quality/pail/test-data/expected/sample_1.parquet.gz
index 4e035f063f3fb7f9bcc0b817d474956a2415f4f9..6395b679c5f4feb95eee8870915589a48683b650 100644
GIT binary patch
literal 1526
zcmV<S1qu2eiwFpD?L}t*19V|?Yc4S^aA9(Bb!Bt_%~sEE+f*F4vm{HmcFnpuN+3d6
zVOFPYP181PfsXYhY0{RaOVTdC5JZmcIB6Zb#CFmYO+ttZXyU?oJ8<OCGbhA>!vqpS
zJ4`#Ei35nsg!lu{#Cy+<n>e9sLHu}1ZNKmPem<Y?_nWW3X&Pihl%4w8M(x|y-~%y1
z5TB91B_aetyj+)9QRDc)f}(PDdAjyST~Y%LrY=og3cMHCX~J!FYI2zuMLCd{n<97N
z!iC98uis%Hm=zgC2{`<Y7s=3~RuSuLKv5YL-db{<8%fP<s1Pp%-g=v93JO`8+UO`M
z-<Xy)b=tv?iqh1iWA#c8?H!7sCMeGp7^ItWQcnM?#1x~e;0UlM3Tr@254led#or@{
zQ$do}T<&-yf4K^<2qOU-yxK|fgbjxM0`*e2#A7ogJc!xhWtC|$LsGLNyO)d&umq@A
zx-9Mm0<HJg7V&+tuxKUny1FOE6ZG{EQ$wtW>qH2BF~)sRr+eacb$yY}pmjjUO`Tt(
zY*@$TC;yb6G?~aA{y}Rmzn%E6>h(^nGxl@%r<>Ql{q(`S_{+^fo$iU()%8U>gVrN_
z|AcGt<9m-ky7zc&NIu;YBXa1AbOx;!9fCSTO&}gZ=OGFBfk=FZ>!errCH@^x5`K^;
zy7zdV_(#<3zTd~ggx9ICHNL@6eu5gkX!E*QSyFjPRW1^1e$=AaC^C|uF#_K;o`S{^
zu`coD2G2;43p?RGv#W2%Ras@kvZOW2=s?jyXPK5z7G+7`6}8ts#)vyL202%o46EDR
zY>jD_Re772%1t=tWSAXx)l^yFB_7&%PPd(bQCI6iS%&_QSvQW?7^N)9<!!#xmYbZS
zThAeDm2a2fNUaM}1LdlpIO|Gzw;}4AlW<d0;m%|C`F&4m!cUF*!i3Z9J17xl^VmH<
zI6U7t=tnl%_5UB$KD{w)s7>4yYJ|SLy5BO+>qF9Wm!$7H>4%QKK|P$~l)-V(6qw`z
z>G__d@1LZf9Bb$d*RY#$8jaQ?@vDp8cO7RwA1+~SUaa&5>G_JJ_fOH!MvgP74=>o@
z3(=F+v(xmKr~iK8x?24&S&z<lWArCu$C=iL>kPcOy}d9_KRI)pfjwM`@LhBgKFch?
zGHK5yz3*PI3_c%(V3t0(Wo(%E56&J9Z=EnE!J{J*3>!u!$>$RbmY;;-B*xq_anB}>
zCf*%!Ch+08Lx7$i&w1>$%X9zyd1UvFf^7Cy{x$vA!~573L~Boo0{}8WUvC1?22lYd
z01!Y-z_w@<fE0R&0kDD%2Y0yU;a~hVbO$0bC)&^ruxLLImLOvWx<wVFkV5-(8~J0r
zh%O1V2W^vYc{36WUWX4$$t7&WK`a4tvB<c?h9WYT3@IQPhyIt@U^N)TvDUCt@gP3D
zlIX$|)~h_ifY=K1-%Za2gGf13#QCpc*Nh2TLTAZZ4Qe$?1+H2wtnV>-POIc|8n>JR
zErbtl^~W0nmUz)wREF4Ur4gwzv$-%g8|joF{u;t}wk{uzNA-<vRc6Bts9mkhtyZ~Y
zZjVEyN?!{GL(jv{AbgE0WLu@#oK`BV)*yZxoopifyorzN_)I?@7csiUBom#&T($+{
z*9vopLu}#m^qPTR0d2&G>zTqNE0%i3(PJ{9u&|~TDW?`@OPyjKw^jqSB91=2`J8x`
z^n4ny7RiVPbK2t)5rxTzMHXo%U<^h)Yw4g7&&u$4(Ajdf#le^gv*A!B*X4<)jCcUJ
zjYYSOeH7^ZwQZJ0Uzoa*6tz+=q81DKixb1|jR2x;L)zqv2`1kzwh9)$)n2|*KB1wO
zj^REonvx+izuP#eWlMgz6_UHPN`ng(^BjKNKxz}!Cj+7xgO3GqL)<K~!Dp?P&bQvG
zNLdm7?HSH}PylY+AiS4$nC810uU=($cCIqbrrZv+_@+{qr9kNV^vv|k)s1zK-dMi1
c>3a(QJ3ZouAWsuS8e~I%0M&+xg&Yt70BmLMU;qFB

literal 1630
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

diff --git a/tests/tests/python-code-code-quality/pail/test-data/expected/sample_2.parquet.gz b/tests/tests/python-code-code-quality/pail/test-data/expected/sample_2.parquet.gz
index 78aef26c826f605185e18cbba59ee88324728cbe..7c9952029322034a6a09e168fb1f92cbda1b1ec4 100644
GIT binary patch
literal 1607
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
F008JM6|VpQ

literal 1714
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
I0(cex0J8Z<Jpcdz

diff --git a/tests/tests/python-code-code-quality/post.sh b/tests/tests/python-code-code-quality/post.sh
index 70288c05..684829b5 100755
--- a/tests/tests/python-code-code-quality/post.sh
+++ b/tests/tests/python-code-code-quality/post.sh
@@ -25,5 +25,5 @@ function validate {
     rm -f "$actual"
 }
 
-validate task.1.parquet "$DATA"/expected/sample1.parquet.gz
-validate task.2.parquet "$DATA"/expected/sample2.parquet.gz
+validate task.1.parquet "$DATA"/expected/sample_1.parquet.gz
+validate task.2.parquet "$DATA"/expected/sample_2.parquet.gz