diff --git a/test/addFile/addFile_books_models_py_commit.expect b/test/addFile/addFile_books_models_py_commit.expect index 4c0e199558e231d02c096f73de2a66f0b0e4d898..fab1543a5b46c56609d841f2af17d92d939138f4 100644 --- a/test/addFile/addFile_books_models_py_commit.expect +++ b/test/addFile/addFile_books_models_py_commit.expect @@ -19,7 +19,7 @@ diff --git books/models.py books/models.py import isbn_search class User(models.Model): -@@ -20,20 +24,26 @@ class BookManager(models.Manager): +@@ -20,20 +24,26 @@ class BookManager(~/models.Manager): eisbn = product.eisbn, author = product.author, title = product.title, diff --git a/test/addFile/addFile_books_models_py_file_diff.expect b/test/addFile/addFile_books_models_py_file_diff.expect index 78c9eb694492d1b406b7f891742d69b11d13883b..6e7c56497d41d971f06a7c7b194bdbcaf85b9f54 100644 --- a/test/addFile/addFile_books_models_py_file_diff.expect +++ b/test/addFile/addFile_books_models_py_file_diff.expect @@ -11,7 +11,7 @@ diff --git books/models.py books/models.py import isbn_search class User(models.Model): -@@ -20,20 +24,26 @@ class BookManager(models.Manager): +@@ -20,20 +24,26 @@ class BookManager(~/models.Manager): eisbn = product.eisbn, author = product.author, title = product.title, diff --git a/test/addHunk/addHunk_books_models_py_commit.expect b/test/addHunk/addHunk_books_models_py_commit.expect index 4c0e199558e231d02c096f73de2a66f0b0e4d898..fab1543a5b46c56609d841f2af17d92d939138f4 100644 --- a/test/addHunk/addHunk_books_models_py_commit.expect +++ b/test/addHunk/addHunk_books_models_py_commit.expect @@ -19,7 +19,7 @@ diff --git books/models.py books/models.py import isbn_search class User(models.Model): -@@ -20,20 +24,26 @@ class BookManager(models.Manager): +@@ -20,20 +24,26 @@ class BookManager(~/models.Manager): eisbn = product.eisbn, author = product.author, title = product.title, diff --git a/test/addHunk/addHunk_books_models_py_file_diff.expect b/test/addHunk/addHunk_books_models_py_file_diff.expect index 78c9eb694492d1b406b7f891742d69b11d13883b..6e7c56497d41d971f06a7c7b194bdbcaf85b9f54 100644 --- a/test/addHunk/addHunk_books_models_py_file_diff.expect +++ b/test/addHunk/addHunk_books_models_py_file_diff.expect @@ -11,7 +11,7 @@ diff --git books/models.py books/models.py import isbn_search class User(models.Model): -@@ -20,20 +24,26 @@ class BookManager(models.Manager): +@@ -20,20 +24,26 @@ class BookManager(~/models.Manager): eisbn = product.eisbn, author = product.author, title = product.title, diff --git a/test/addSelect/addSelect_books_models_py_2_vselect_diff.expect b/test/addSelect/addSelect_books_models_py_2_vselect_diff.expect index 313e368f29470f6ff6a979618df9315f464b9697..a4360cb71893dad40480f77fd57cd1177f3c769c 100644 --- a/test/addSelect/addSelect_books_models_py_2_vselect_diff.expect +++ b/test/addSelect/addSelect_books_models_py_2_vselect_diff.expect @@ -11,7 +11,7 @@ diff --git books/models.py books/models.py import isbn_search class User(models.Model): -@@ -22,6 +26,10 @@ class BookManager(models.Manager): +@@ -22,6 +26,10 @@ class BookManager(~/models.Manager): title = product.title, edition = product.edition ) diff --git a/test/addSelect/addSelect_books_models_py_3_lines_diff.expect b/test/addSelect/addSelect_books_models_py_3_lines_diff.expect index 0698fb66d39dc915ee85ca4076aed3be3897f47b..cef8123749ea955016d1c72b7bd40e76a2a5416b 100644 --- a/test/addSelect/addSelect_books_models_py_3_lines_diff.expect +++ b/test/addSelect/addSelect_books_models_py_3_lines_diff.expect @@ -11,7 +11,7 @@ diff --git books/models.py books/models.py import isbn_search class User(models.Model): -@@ -22,11 +26,15 @@ class BookManager(models.Manager): +@@ -22,11 +26,15 @@ class BookManager(~/models.Manager): title = product.title, edition = product.edition ) diff --git a/test/addSelect/addSelect_books_models_py_4_marks_diff.expect b/test/addSelect/addSelect_books_models_py_4_marks_diff.expect index e4dfb93e28e550be0d1e434cd6792eb11b0224ab..eb3407829d821fdc4ebefd8c3847b5de8e19129b 100644 --- a/test/addSelect/addSelect_books_models_py_4_marks_diff.expect +++ b/test/addSelect/addSelect_books_models_py_4_marks_diff.expect @@ -11,7 +11,7 @@ diff --git books/models.py books/models.py import isbn_search class User(models.Model): -@@ -22,15 +26,22 @@ class BookManager(models.Manager): +@@ -22,15 +26,22 @@ class BookManager(~/models.Manager): title = product.title, edition = product.edition ) diff --git a/test/addSelect/addSelect_books_models_py_5_vselect_diff.expect b/test/addSelect/addSelect_books_models_py_5_vselect_diff.expect index a79fdaff02895ff98363f939a8ce38924a5dc836..3005386c6351905051fbfcd5d446fb2118aa9ce3 100644 --- a/test/addSelect/addSelect_books_models_py_5_vselect_diff.expect +++ b/test/addSelect/addSelect_books_models_py_5_vselect_diff.expect @@ -11,7 +11,7 @@ diff --git books/models.py books/models.py import isbn_search class User(models.Model): -@@ -24,13 +28,16 @@ class BookManager(models.Manager): +@@ -24,13 +28,16 @@ class BookManager(~/models.Manager): ) return book diff --git a/test/commit/commit_commit2.expect b/test/commit/commit_commit2.expect index 4c521ef0e50e628d472a0cce8811d2161f8618f4..e8e86e3b6e64327a0ce568a04864dbadb899dbee 100644 --- a/test/commit/commit_commit2.expect +++ b/test/commit/commit_commit2.expect @@ -4,7 +4,7 @@ Uber commit message diff --git books/models.py books/models.py --- books/models.py +++ books/models.py -@@ -24,20 +24,26 @@ class BookManager(models.Manager): +@@ -24,20 +24,26 @@ class BookManager(~/models.Manager): eisbn = product.eisbn, author = product.author, title = product.title, diff --git a/test/commit/commit_diff3.expect b/test/commit/commit_diff3.expect index cdc0a2f29ecd62eb850ffcd0fd61f47d510bda11..8e47e78f78bcfd595ccd3f3f42c95bb55f5297c8 100644 --- a/test/commit/commit_diff3.expect +++ b/test/commit/commit_diff3.expect @@ -1,7 +1,7 @@ diff --git books/models.py books/models.py --- books/models.py +++ books/models.py -@@ -24,20 +24,26 @@ class BookManager(models.Manager): +@@ -24,20 +24,26 @@ class BookManager(~/models.Manager): eisbn = product.eisbn, author = product.author, title = product.title, diff --git a/test/run.sh b/test/run.sh index 47bd3d2b9339acffebd33cfa672bd06146b82d8c..dd7cbc9af385ce184a3875d2b1d460c12b56e20a 100755 --- a/test/run.sh +++ b/test/run.sh @@ -26,10 +26,11 @@ fi pushd "$TEST_PATH" git config --local user.email 'tester@vimagit.org' git config --local user.name 'vimagit tester' -export TEST_HEAD_SHA1='origin/vimagit_test-1.4.1' +export TEST_HEAD_SHA1='origin/vimagit_test-1.7.3' +export TEST_RESET_TAG='reset-here' git submodule update git show $TEST_HEAD_SHA1 --stat -git reset $TEST_HEAD_SHA1~1 && git status --porcelain && git reset --hard $TEST_HEAD_SHA1 +git reset $TEST_RESET_TAG && git status --porcelain && git reset --hard $TEST_HEAD_SHA1 popd if [ "$VIM_VERSION" = 'neovim' ]; then diff --git a/test/setup.inc b/test/setup.inc index bb56adc66e3ac56c8391ef6ac312aec0f73cb4e2..4fa8f8542da2714365d268a70a050799a3709fdb 100644 --- a/test/setup.inc +++ b/test/setup.inc @@ -1,6 +1,6 @@ Execute (setup): source $VIMAGIT_PATH/test/utils.vim call Cd_test() - call system("git reset " . $TEST_HEAD_SHA1 . "~1") + call system("git reset " . $TEST_RESET_TAG ) call Git_verbose_log(system("git status --porcelain")) call Cd_test_sub()