Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-17 13:37:18 +03:00
Code Issues Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Martin Marmsoler 2023-02-17 12:25:22 +01:00
parent 1efd6206c7
commit ad659ad583
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/rebase.cpp
View File

@ -233,7 +233,7 @@ void TestRebase::conflictingRebase() {
// Checkout correct branch
repoView->checkout(branch);
QTest::qWait(10000);
QTest::qWait(1000);
// Rebase on main
git::Reference mainBranch = mRepo.lookupRef(QString("refs/heads/main"));
@ -628,7 +628,7 @@ void TestRebase::abortMR() {
int count) {
QVERIFY(rebase.isValid());
QCOMPARE(count, 1);
QCOMPARE(before.message(), "File.txt changed by secondbranch\n");
QCOMPARE(before.message(), "File.txt changed by second branch\n");
rebaseAboutToRebase++;
});
connect(mRepo.notifier(), &git::RepositoryNotifier::rebaseCommitInvalid,