Adding upstream version 3.6.12.upstream/3.6.12upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 284 insertions, 0 deletions

diff --git a/t/basic.t b/t/basic.t
new file mode 100755
index 0000000..7579935
--- /dev/null
+++ b/t/basic.t
@@ -0,0 +1,284 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+# this is hardcoded; change it if needed
+use lib "src/lib";
+use Gitolite::Test;
+
+# some more basic tests
+# ----------------------------------------------------------------------
+
+try "
+    plan 217
+    CHECK_SETUP
+
+    # subtest 1
+    cd ..
+    CLONE dev2 gitolite-admin ga2
+                                !ok;    gsh
+                                        /DENIED by fallthru/
+                                        /fatal: Could not read from remote repository/
+    glt clone admin --progress file:///gitolite-admin ga2
+                                ok;     gsh
+                                        /Counting/; /Compressing/; /Total/
+    cd gitolite-admin;          ok
+    ";
+
+put "conf/gitolite.conf", "
+    \@admins     =   admin dev1
+    repo gitolite-admin
+        -   mm  =   \@admins
+        RW      =   \@admins
+        RW+     =   admin
+
+    repo testing
+        RW+     =   \@all
+";
+
+try "
+    # push
+    git add conf;               ok
+    git status -s;              ok;     /M  conf/gitolite.conf/
+    git commit -m t01a;         ok;     /master.*t01a/
+    PUSH dev2;                  !ok;    gsh
+                                        /DENIED by fallthru/
+                                        /fatal: Could not read from remote repository/
+    PUSH admin;                 ok;     /master -> master/
+    empty;                      ok;
+    PUSH admin master:mm
+                                !ok;    gsh
+                                        /DENIED by refs/heads/mm/
+                                        reject
+    ";
+
+put "conf/gitolite.conf", "
+    \@admins     =   admin dev1
+    repo gitolite-admin
+        RW+     =   admin
+
+    repo testing
+        RW+     =   \@all
+
+    repo t1
+        R       =   u2
+        RW      =   u3
+        RW+     =   u4
+";
+
+try "
+    # subtest 2
+    ADMIN_PUSH t01b
+
+    # clone
+    cd ..;                      ok;
+    CLONE u1 t1;                !ok;    gsh
+                                        /DENIED by fallthru/
+                                        /fatal: Could not read from remote repository/
+    CLONE u2 t1;                ok;     gsh
+                                        /warning: You appear to have cloned an empty repository./
+    [ -d t1/.git ];             ok
+    cd t1;                      ok;
+
+    # push
+    test-commit tc1 tc2 tc2;    ok;     /a530e66/
+    PUSH u2;                    !ok;    gsh
+                                        /DENIED by fallthru/
+                                        /fatal: Could not read from remote repository/
+    PUSH u3 master;             ok;     gsh
+                                        /master -> master/
+
+    # rewind
+    reset-h HEAD^;              ok;     /HEAD is now at aa2b5c5 tc2/
+    test-tick; test-commit tc3; ok;     /3ffced1/
+    PUSH u3;                    !ok;    gsh
+                                        /rejected.*master -> master.*non-fast-forward./
+    PUSH u3 -f;                 !ok;    gsh
+                                        reject
+                                        /DENIED by fallthru/
+    PUSH u4 +master;            ok;     gsh
+                                        / \\+ a530e66...3ffced1 master -> master.*forced update./
+";
+
+put "../gitolite-admin/conf/gitolite.conf", "
+    \@admins     =   admin dev1
+    repo gitolite-admin
+        RW+     =   admin
+
+    include 'i1.conf'
+";
+
+put "../gitolite-admin/conf/i1.conf", "
+    \@g1 = u1
+    \@g2 = u2
+    \@g3 = u3
+    \@gaa = aa
+    repo \@gaa
+        RW+                 =   \@g1
+        RW                  =   \@g2
+        RW+     master      =   \@g3
+        RW      master      =   u4
+        -       master      =   u5
+        RW+     dev         =   u5
+        RW                  =   u5
+";
+
+try "
+    # subtest 3
+    ADMIN_PUSH t01c
+
+    cd ..;                      ok
+";
+
+try "
+    CLONE u1 aa;                ok;     gsh
+    cd aa;                      ok
+    test-commit set3 t1 t2 t3 t4 t5 t6 t7 t8 t9
+                                ok
+    PUSH u1 HEAD;               ok;     gsh
+                                        /To file:///aa/
+                                        /\\* \\[new branch\\]      HEAD -> master/
+    branch dev;                 ok
+    branch foo;                 ok
+
+    # u1 rewind master ok
+    reset-h HEAD^;              ok
+    test-commit r1;             ok
+    PUSH u1 +master;            ok;     gsh
+                                        /To file:///aa/
+                                        /\\+ 27ed463...05adfb0 master -> master .forced update./
+
+    # u2 rewind master !ok
+    reset-h HEAD^;              ok
+    test-commit r2;             ok
+    PUSH u2 +master;            !ok;    gsh
+                                        reject
+                                        /DENIED by fallthru/
+
+    # u3 rewind master ok
+    reset-h HEAD^;              ok
+    test-commit r3;             ok
+    PUSH u3 +master;            ok;     gsh
+                                        /To file:///aa/
+                                        /\\+ 05adfb0...6a532fe master -> master .forced update./
+
+    # u4 push master ok
+    test-commit u4;             ok
+    PUSH u4 master;             ok;     gsh
+                                        /To file:///aa/
+                                        /6a532fe..f929773 +master -> master/
+
+    # u4 rewind master !ok
+    reset-h HEAD^;              ok
+    PUSH u4 +master;            !ok;    gsh
+                                        reject
+                                        /DENIED by fallthru/
+
+    # u3,u4 push other branches !ok
+    PUSH u3 dev;                !ok;    gsh
+                                        reject
+                                        /DENIED by fallthru/
+    PUSH u4 dev;                !ok;    gsh
+                                        reject
+                                        /DENIED by fallthru/
+    PUSH u3 foo;                !ok;    gsh
+                                        reject
+                                        /DENIED by fallthru/
+    PUSH u4 foo;                !ok;    gsh
+                                        reject
+                                        /DENIED by fallthru/
+
+    # clean up for next set
+    glt push u1 -f origin master dev foo
+                                ok;     gsh
+                                        /f929773...6a532fe master -> master .forced update./
+                                        /new branch.*dev -> dev/
+                                        /new branch.*foo -> foo/
+
+    # u5 push master !ok
+    test-commit u5
+    PUSH u5 master;             !ok;    gsh
+                                        reject
+                                        /DENIED by refs/heads/master/
+
+    # u5 rewind dev ok
+    PUSH u5 +dev^:dev
+                                ok;     gsh
+                                        /\\+ 27ed463...1ad477a dev\\^ -> dev .forced update./
+
+
+    # u5 rewind foo !ok
+    PUSH u5 +foo^:foo
+                                !ok;    gsh
+                                        reject
+                                        /remote: FATAL: \\+ refs/heads/foo aa u5 DENIED by fallthru/
+
+    # u5 push foo ok
+    git checkout foo
+    /Switched to branch 'foo'/
+
+    test-commit u5
+    PUSH u5 foo;                ok;     gsh
+                                        /27ed463..83da62c *foo -> foo/
+
+    # u1 delete dev ok
+    PUSH u1 :dev;               ok;     gsh
+                                        / - \\[deleted\\] *dev/
+
+    # push it back
+    PUSH u1 dev;                ok;     gsh
+                                        /\\* \\[new branch\\] *dev -> dev/
+
+";
+
+put "| cat >> ../gitolite-admin/conf/gitolite.conf", "
+    \@gr1 = r1
+    repo \@gr1
+        RW  refs/heads/v[0-9]   = u1
+        RW  refs/heads          = tester
+";
+
+try "
+    # subtest 4
+    ADMIN_PUSH t01d
+
+    cd ..;                      ok
+
+    CLONE tester r1;            ok;     gsh
+                                        /Cloning into 'r1'.../
+    cd r1;                      ok
+    test-commit r1a r1b r1c r1d r1e r1f
+                                ok
+    PUSH tester HEAD;           ok;     gsh
+                                        /\\* \\[new branch\\] *HEAD -> master/
+    git branch v1
+    PUSH tester v1;             ok;     gsh
+                                        /\\* \\[new branch\\] *v1 -> v1/
+
+";
+
+put "| cat >> ../gitolite-admin/conf/gitolite.conf", "
+    \@gr2 = r2
+    repo \@gr2
+        RW  refs/heads/v[0-9]   = u1
+        -   refs/heads/v[0-9]   = tester
+        RW  refs/heads          = tester
+";
+
+try "
+    # subtest 5
+    ADMIN_PUSH t01e
+
+    cd ..;                      ok
+
+    CLONE tester r2;            ok;     gsh
+                                        /Cloning into 'r2'.../
+    cd r2;                      ok
+    test-commit r2a r2b r2c r2d r2e r2f
+                                ok
+    PUSH tester HEAD;           ok;     gsh
+                                        /\\* \\[new branch\\] *HEAD -> master/
+    git branch v1
+    PUSH tester v1;             !ok;    gsh
+                                        /W refs/heads/v1 r2 tester DENIED by refs/heads/v\\[0-9\\]/
+"