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

No need to wait that long

Browse Source
This commit is contained in:
Martin Marmsoler 2023-02-17 13:03:54 +01:00
parent 96704ade13
commit c43784efac
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/rebase.cpp
View File

@ -233,7 +233,7 @@ void TestRebase::conflictingRebase() {
// Checkout correct branch
repoView->checkout(branch);
QTest::qWait(1000);
QTest::qWait(100);
// Rebase on main
git::Reference mainBranch = mRepo.lookupRef(QString("refs/heads/main"));
@ -263,14 +263,14 @@ void TestRebase::conflictingRebase() {
-1); // just write something to resolve the conflict
f.close();
QTest::qWait(1000);
QTest::qWait(100);
refreshTriggered = 0;
repoView->continueRebase(); // should fail
QCOMPARE(rebaseConflict, 2); // User tries to continue without staging
QCOMPARE(refreshTriggered, 1);
QTest::qWait(1000); // Wait until refresh is done
QTest::qWait(100); // Wait until refresh is done
// Staging the file
auto filewidgets = repoView->findChildren<FileWidget *>();
@ -300,7 +300,7 @@ void TestRebase::conflictingRebase() {
// Check that rebase was really finished
QCOMPARE(mRepo.rebaseOngoing(), false);
QTest::qWait(1000); // Wait until refresh finished
QTest::qWait(100); // Wait until refresh finished
// Check that buttons are visible
QCOMPARE(continueRebaseButton->isVisible(), false);
@ -493,7 +493,7 @@ void TestRebase::startRebaseContinueInCLI() {
// EXECUTE_GIT_COMMAND(path, "rebase --continue", 1)
// Test::refresh(repoView); // TODO: must be called, because when changing
// externally the repoView will not be notified. QTest::qWait(1000);
// externally the repoView will not be notified. QTest::qWait(100);
// // Does not work, because libgit2 does not detect interactive rebases
// QCOMPARE(repoView->isRebaseContinueVisible(), false);
@ -689,8 +689,8 @@ void TestRebase::abortMR() {
// Check that rebase was really finished
QCOMPARE(mRepo.rebaseOngoing(), false);
QTest::qWait(1000); // wait until detailview will be updated, after updating
// status is finished
QTest::qWait(100); // wait until detailview will be updated, after updating
// status is finished
// Check that buttons are visible
QCOMPARE(continueRebaseButton->isVisible(), false);
@ -834,6 +834,8 @@ void TestRebase::commitDuringRebase() {
// Check that rebase was really finished
QCOMPARE(mRepo.rebaseOngoing(), false);
QTest::qWait(10); // Wait until refresh is finished
// Check that buttons are visible
QCOMPARE(continueRebaseButton->isVisible(), false);
QCOMPARE(abortRebaseButton->isVisible(), false);