diff --git a/test/functional_tests/test_git_update.sh b/test/functional_tests/test_git_update.sh index 503fb6f..8d48bff 100755 --- a/test/functional_tests/test_git_update.sh +++ b/test/functional_tests/test_git_update.sh @@ -32,12 +32,12 @@ SUBMODULE_NAME="submodule" REMOTE="file://${WORKING_DIRECTORY}/remote/$REPO_NAME" #we must trick git_update.sh into thinking we are not working in local, otherwise depth=1 is not respected LOCAL_REMOTE="${WORKING_DIRECTORY}/remote/$REPO_NAME" #cd does not understand file:// LOCAL_REMOTE_SUBMODULE="/${WORKING_DIRECTORY}/remote/$SUBMODULE_NAME" -FILENAMES=("sample0" "sample1 sample3") -FILENAMES_TAG=("sample0 sample1 sample4") +FILENAMES=("sample0" "sample1 sample4") +FILENAMES_TAG=("sample0 sample1 sample3") FILENAMES_BRANCH=("sample0 sample1 sample2") FILE_ON_BRANCH_ONLY="sample2" -FILE_ON_TAG_ONLY="sample4" -FILE_ON_MAIN_ONLY="sample3" +FILE_ON_TAG_ONLY="sample3" +FILE_ON_MAIN_ONLY="sample4" FILE_TO_BE_DELETED="sample0" FILE_TO_BE_DELETED_SUBMODULE="sub_sample0" FILE_TO_BE_CREATED="new_file" @@ -186,7 +186,7 @@ modification_submodule_check(){ else echo "$FILE_TO_BE_DELETED_SUBMODULE has been deleted." fi - cd .. + cd ../.. } switching_branch_check(){ @@ -261,12 +261,11 @@ undo_modification_remote(){ modification_submodule(){ cd $LOCAL_REMOTE_SUBMODULE - pwd touch $FILE_TO_BE_CREATED echo "new text" > $FILE_TO_BE_CREATED rm $FILE_TO_BE_DELETED_SUBMODULE git add $FILE_TO_BE_CREATED $FILE_TO_BE_DELETED_SUBMODULE &> /dev/null - git commit -m "$FILE_TO_BE_CREATED created and $FILE_TO_BE_DELETED_SUBMODULE deleted" #&> /dev/null + git commit -m "$FILE_TO_BE_CREATED created and $FILE_TO_BE_DELETED_SUBMODULE deleted" &> /dev/null cd ../.. } @@ -400,7 +399,7 @@ test3(){ modification_check $REPO_NAME history_check $REPO_NAME #cleaning - #undo_modification_remote + undo_modification_remote case3=$((modification_result+history_result)) if [ "$case3" = "0" ]; then @@ -535,6 +534,7 @@ test8(){ ../../../src/git_update.sh -r $TAG_NAME $REMOTE &> /dev/null cd .. #intermediate check to make sure that we are starting on the initial position of the tag + echo "first position of the tag" switching_tag_check $REPO_NAME #change the position of the tag changing_tag @@ -570,7 +570,6 @@ test9(){ modification_submodule #make git_update.sh update the repository cd $REPO_NAME - echo "moment fatidique" ../../../src/git_update.sh $REMOTE &> /dev/null cd .. #checks