From 0017ebbac9fa8a64f2108d1aa05a452bbb04ccad Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Tue, 20 Sep 2016 16:07:56 +0200
Subject: [PATCH] [beaker-tests-distgit] added tests for tito subdir +
 different branch usecases

---
 .../0b/ce0ac9cc8c7f90d9150330d26546675fceabe0 | Bin 0 -> 118 bytes
 .../42/bdfe68c9e03e21e6dc5dcc4f4dc9a7bbbc8d12 | Bin 0 -> 152 bytes
 .../9e/d0e82dbc7bbd475c5631e71e04a2058322c677 | Bin 0 -> 579 bytes
 .../fd/8c7cbf3951b9a0332830dbeff5a38034de07f5 | Bin 0 -> 164 bytes
 .../git/example2.git/refs/heads/somebranch    |   1 +
 .../dist-git/tests/batch1/import-tasks.json   |  22 ++++++++++++++++++
 6 files changed, 23 insertions(+)
 create mode 100644 beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/0b/ce0ac9cc8c7f90d9150330d26546675fceabe0
 create mode 100644 beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/42/bdfe68c9e03e21e6dc5dcc4f4dc9a7bbbc8d12
 create mode 100644 beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/9e/d0e82dbc7bbd475c5631e71e04a2058322c677
 create mode 100644 beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/fd/8c7cbf3951b9a0332830dbeff5a38034de07f5
 create mode 100644 beaker-tests/Regression/dist-git/files/home/git/example2.git/refs/heads/somebranch

diff --git a/beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/0b/ce0ac9cc8c7f90d9150330d26546675fceabe0 b/beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/0b/ce0ac9cc8c7f90d9150330d26546675fceabe0
new file mode 100644
index 0000000000000000000000000000000000000000..ab475b86bc99d246a183cf8c89b35d719c6e4414
GIT binary patch
literal 118
zcmV-+0Ez#20V^p=O;s>7FlI0`FfcPQQP4}zEXhpI%P&f0SZ4jE=h+JmEzAGUo-P#+
zHkPk_^xeb&2o&^6GE4FqCSJXqUbf`e6&tnR$4bJtDl|rYy#bLgE=?-PPG@l1`!D0<
Y13SfMcVf@@`<`6Bdrz+r0LFbVn37R7cK`qY

literal 0
HcmV?d00001

diff --git a/beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/42/bdfe68c9e03e21e6dc5dcc4f4dc9a7bbbc8d12 b/beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/42/bdfe68c9e03e21e6dc5dcc4f4dc9a7bbbc8d12
new file mode 100644
index 0000000000000000000000000000000000000000..75e25a20f2d377e3c1f387c4bb8e6a8c0812a835
GIT binary patch
literal 152
zcmV;J0B8Sr0V^p=O;s>7F=sF|FfcPQQSeR7PEE_qNo7cO-oGq=*3!kC{n@-)Er&mB
zk;+~LRTJdu=;G_Dmz%=Cbf@cJeO(k|(5kk!OCc$nANUvihbl^~NX#wBN!2SZNKIy#
zcj1NZp6b2sF=2+!<yaQ6HY*(~hpNj>%*@kEW>}Juc2h6t*lDRApUWZ@W$IE=NoD|9
G0XfWy_em!J

literal 0
HcmV?d00001

diff --git a/beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/9e/d0e82dbc7bbd475c5631e71e04a2058322c677 b/beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/9e/d0e82dbc7bbd475c5631e71e04a2058322c677
new file mode 100644
index 0000000000000000000000000000000000000000..e470b5eff9da2ed9ebc19ca57bf5e93eeb71955b
GIT binary patch
literal 579
zcmV-J0=)fr0hLqRYTPgo?d$3*27)QH*n4S`ZkEs{r8H2IP_jv1jVw=WVOdfnc{j<j
zpVp`TSV!80KJ-Fs47$ynIp=6pDO178{OH9s?{NXU4<C7N6|%4Byfk_-niiAdklmm{
z?va++=6x-F*s|r&_uM@#Mz^i>KtBgBV=nA5AQ%Yf0|;Xs`!GmVpF7b~rN{Ykd3?y&
zg)@U)j7I0yDk*rNf`0r-Qu#|MP{(=~UoKa(*X-`*lH%GB>|#7_WN3$~5T<8KGdO{h
z#VFfoQnAgm&1%PdTLkWk=9#gB$ZJqMU=1}|)HP}$(X)fZ=>{JL>Ch9e8hsax&F_gq
zJ_M<L6Vrrlme;sK1r3IPkAbm_5`~jC3Si4$OsKIZVZjlD<i$(!s**~QIYm)O4c_!v
zIj%)pFha8qEz3NH!9xBJcdBR}>v@Mj{+GVDWq+@D<G1lt5;#|i?MKLKib^TYn6S+@
zrLUx}rQ0$=h#Y!OMgI^oj)xI7n&3&A5w!RTu|Lm5%XNdwH0%}JwgY_T8fH_NO{T{n
zl<W~s({SdnZh45e^$t=q<x`e}#x+<jI^G~essYw?s}N)`?0*s8B*d7u95j4HK`bJX
zqrVfGr8I9TK5B)XB1kwqB%JBV4(CpH+N?Fi9!nyo|03ebXt*{jAV(6LE9s0^d_^=x
z`~4f7_WO-9Pa98#c#aOeohNLvw^mp-s4+H9+1RG+@Cke;t%o=h4%3r?b&J$Pve8mE
R@gdUt<dwpj{Q&ikMHtHm8M6QY

literal 0
HcmV?d00001

diff --git a/beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/fd/8c7cbf3951b9a0332830dbeff5a38034de07f5 b/beaker-tests/Regression/dist-git/files/home/git/example2.git/objects/fd/8c7cbf3951b9a0332830dbeff5a38034de07f5
new file mode 100644
index 0000000000000000000000000000000000000000..fed21f8936f3f888ecdc0a1757170e186fd3c102
GIT binary patch
literal 164
zcmV;V09*ff0hNwHYQr!P0CUzW_FgEfl`LBjLSE2&kE_+HF+`S8WJrHsf1z_67#L}_
zt^<hZGP){Y5=E9MvdCN_=4dB$4l{+xhcHh?l#`;_x$8DSgc26=v2a`#7A}e|P@t5&
zjghH1Of(0>$9S|3-|gt|#Z}?@+m5@wx$aN>lvZzG{p?+^Hahsg6LZ>gZs<QVll3Ki
S-N)KCkOyx+n#~^sa7MGgB~EDo

literal 0
HcmV?d00001

diff --git a/beaker-tests/Regression/dist-git/files/home/git/example2.git/refs/heads/somebranch b/beaker-tests/Regression/dist-git/files/home/git/example2.git/refs/heads/somebranch
new file mode 100644
index 000000000..0195117eb
--- /dev/null
+++ b/beaker-tests/Regression/dist-git/files/home/git/example2.git/refs/heads/somebranch
@@ -0,0 +1 @@
+fd8c7cbf3951b9a0332830dbeff5a38034de07f5
diff --git a/beaker-tests/Regression/dist-git/tests/batch1/import-tasks.json b/beaker-tests/Regression/dist-git/tests/batch1/import-tasks.json
index d73967af9..c57a3d8a1 100644
--- a/beaker-tests/Regression/dist-git/tests/batch1/import-tasks.json
+++ b/beaker-tests/Regression/dist-git/tests/batch1/import-tasks.json
@@ -75,5 +75,27 @@
     "source_type": 4,
     "task_id": "7-f23",
     "user": "clime"
+},
+{
+    "_description": "tito-source test for a git repo subdirectory",
+    "_expected_outcome": "success",
+
+    "branch": "master",
+    "project": "example",
+    "source_json": "{\"tito_test\": true, \"git_dir\": \"subpkg\", \"git_url\": \"git@localhost:example2.git\", \"git_branch\": \"\"}",
+    "source_type": 3,
+    "task_id": "8-master",
+    "user": "clime"
+},
+{
+    "_description": "tito-source test for a different-than-master branch",
+    "_expected_outcome": "success",
+
+    "branch": "master",
+    "project": "example",
+    "source_json": "{\"tito_test\": true, \"git_dir\": \"subpkg\", \"git_url\": \"git@localhost:example2.git\", \"git_branch\": \"somebranch\"}",
+    "source_type": 3,
+    "task_id": "9-master",
+    "user": "clime"
 }
 ]