Skip to content

Test Cases: Add a git-style file-add patch #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Test Cases: Add a git-style file-add patch #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d51ba9e
Test Cases: Add a git-style file-add patch
Nov 26, 2024
8b6dffd
Merge branch 'master' into test-case-git-style
nephros Nov 27, 2024
2035d28
[patch.json] Fix typos
Olf0 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/patching/add-a-file-git-style/add-a-file-git-style.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TEMPLATE = aux

patch.path = /usr/share/patchmanager/patches/pm-test-case-add-a-file-git-style
patch.files = patch/unified_diff.patch patch/patch.json

INSTALLS += patch
17 changes: 17 additions & 0 deletions tests/patching/add-a-file-git-style/makediff.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/sh

mkdir repo
pushd repo >/dev/null
git init
mkdir -p usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests
printf 'this file already exists\n' > usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/pre-existing-file
git add --all >/dev/null
git commit --author "Test User <test@example.org>" --all -m "initial commit" >/dev/null
git commit --allow-empty --author "Test User <test@example.org>" --all -m "empty commit" >/dev/null
printf 'this file is new\n' > usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file
git add --all >/dev/null
git commit --author "Test User <test@example.org>" --all -m "second commit" >/dev/null
git diff HEAD~1 | tee ../patch/unified_diff.patch
popd >/dev/null

rm -rf repo
11 changes: 11 additions & 0 deletions tests/patching/add-a-file-git-style/patch/patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"description": "Patchmanager Test Case: Add a new file, using a git-style patch. This changes nothing in the UI, please just check that the resulting files are in the correct place.",
"name": "pm-test-case-add-a-file-git-style",
"display_name": "PM Test Case 3.1",
"category": "other",
"author": "patchmanager",
"version": "1.0.0",
"compatible": [
"5.0.0.29"
]
}
7 changes: 7 additions & 0 deletions tests/patching/add-a-file-git-style/patch/unified_diff.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
diff --git a/usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file b/usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file
new file mode 100644
index 0000000..1848ba0
--- /dev/null
+++ b/usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file
@@ -0,0 +1 @@
+this file is new
1 change: 1 addition & 0 deletions tests/patching/patching.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
TEMPLATE = subdirs
SUBDIRS = app \
add-a-file \
add-a-file-git-style \
patch-too-new \
patch-too-old \
patch-a-bit-newer \
Expand Down