Просмотр исходного кода

Add test for nested Git repository

I don’t know how this should work, but let’s at least record the current behaviour in case it changes
Benjamin Sago 8 лет назад
Родитель
Сommit
cfc05eef00
6 измененных файлов с 24 добавлено и 10 удалено
  1. 5 0
      Vagrantfile
  2. 1 0
      xtests/git_1212
  3. 4 0
      xtests/git_2_recurse
  4. 1 0
      xtests/git_2_repository
  5. 5 3
      xtests/git_2_tree
  6. 8 7
      xtests/run.sh

+ 5 - 0
Vagrantfile

@@ -544,6 +544,11 @@ Vagrant.configure(2) do |config|
         mkdir "target"
         touch "target/another ignored file"
 
+        mkdir "deeply/nested/repository"
+        cd    "deeply/nested/repository"
+        git init
+        touch subfile
+
         find "#{test_dir}/git2" -exec touch {} -t #{some_date} \\;
         sudo chown #{user}:#{user} -R "#{test_dir}/git2"
     EOF

+ 1 - 0
xtests/git_1212

@@ -13,3 +13,4 @@
 
 /testcases/git2/deeply/nested:
 drwxrwxr-x - cassowary  1 Jan 12:34 -N directory
+drwxrwxr-x - cassowary  1 Jan 12:34 -N repository

+ 4 - 0
xtests/git_2_recurse

@@ -7,11 +7,15 @@
 
 /testcases/git2/deeply/nested:
 drwxrwxr-x - cassowary  1 Jan 12:34 directory
+drwxrwxr-x - cassowary  1 Jan 12:34 repository
 
 /testcases/git2/deeply/nested/directory:
 .rw-rw-r--  0 cassowary  1 Jan 12:34 l8st
 .rw-rw-r-- 18 cassowary  1 Jan 12:34 upd8d
 
+/testcases/git2/deeply/nested/repository:
+.rw-rw-r-- 0 cassowary  1 Jan 12:34 subfile
+
 /testcases/git2/ignoreds:
 .rw-rw-r-- 0 cassowary  1 Jan 12:34 music.m4a
 .rw-rw-r-- 0 cassowary  1 Jan 12:34 music.mp3

+ 1 - 0
xtests/git_2_repository

@@ -0,0 +1 @@
+.rw-rw-r-- 0 cassowary  1 Jan 12:34 -N subfile

+ 5 - 3
xtests/git_2_tree

@@ -1,9 +1,11 @@
 drwxrwxr-x  - cassowary  1 Jan 12:34 /testcases/git2
 drwxrwxr-x  - cassowary  1 Jan 12:34 ├── deeply
 drwxrwxr-x  - cassowary  1 Jan 12:34 │  └── nested
-drwxrwxr-x  - cassowary  1 Jan 12:34 │     └── directory
-.rw-rw-r--  0 cassowary  1 Jan 12:34 │        ├── l8st
-.rw-rw-r-- 18 cassowary  1 Jan 12:34 │        └── upd8d
+drwxrwxr-x  - cassowary  1 Jan 12:34 │     ├── directory
+.rw-rw-r--  0 cassowary  1 Jan 12:34 │     │  ├── l8st
+.rw-rw-r-- 18 cassowary  1 Jan 12:34 │     │  └── upd8d
+drwxrwxr-x  - cassowary  1 Jan 12:34 │     └── repository
+.rw-rw-r--  0 cassowary  1 Jan 12:34 │        └── subfile
 drwxrwxr-x  - cassowary  1 Jan 12:34 ├── ignoreds
 .rw-rw-r--  0 cassowary  1 Jan 12:34 │  ├── music.m4a
 .rw-rw-r--  0 cassowary  1 Jan 12:34 │  └── music.mp3

+ 8 - 7
xtests/run.sh

@@ -196,13 +196,14 @@ $exa $testcases/git/additions         -l --git 2>&1 | diff -q - $results/git_1_a
 $exa $testcases/git/edits             -l --git 2>&1 | diff -q - $results/git_1_edits      || exit 1
 $exa $testcases/git/{additions,edits} -l --git 2>&1 | diff -q - $results/git_1_both       || exit 1
 
-$exa $testcases/git2                          -l --git 2>&1 | diff -q - $results/git_2_long      || exit 1
-$exa $testcases/git2                          -l       2>&1 | diff -q - $results/git_2_nogit     || exit 1
-$exa $testcases/git2                   --tree -l --git 2>&1 | diff -q - $results/git_2_tree      || exit 1
-$exa $testcases/git2                --recurse -l --git 2>&1 | diff -q - $results/git_2_recurse   || exit 1
-$exa $testcases/git2/ignoreds                 -l --git 2>&1 | diff -q - $results/git_2_ignoreds  || exit 1
-$exa $testcases/git2/target                   -l --git 2>&1 | diff -q - $results/git_2_target    || exit 1
-$exa $testcases/git2/{deeply,ignoreds,target} -l --git 2>&1 | diff -q - $results/git_2_all       || exit 1
+$exa $testcases/git2                          -l --git 2>&1 | diff -q - $results/git_2_long        || exit 1
+$exa $testcases/git2                          -l       2>&1 | diff -q - $results/git_2_nogit       || exit 1
+$exa $testcases/git2                   --tree -l --git 2>&1 | diff -q - $results/git_2_tree        || exit 1
+$exa $testcases/git2                --recurse -l --git 2>&1 | diff -q - $results/git_2_recurse     || exit 1
+$exa $testcases/git2/ignoreds                 -l --git 2>&1 | diff -q - $results/git_2_ignoreds    || exit 1
+$exa $testcases/git2/target                   -l --git 2>&1 | diff -q - $results/git_2_target      || exit 1
+$exa $testcases/git2/deeply/nested/repository -l --git 2>&1 | diff -q - $results/git_2_repository  || exit 1
+$exa $testcases/git2/{deeply,ignoreds,target} -l --git 2>&1 | diff -q - $results/git_2_all         || exit 1
 
 $exa $testcases/git $testcases/git2 --git --long | diff -q - $results/git_12  || exit 1