Forum Discussion

ThatsRad's avatar
ThatsRad
New Contributor
4 years ago

Execution Plan / Organize Tests tab greyed out

I have recently started using the Version Control with Test Complete - Git - Azure DevOps server. Came across some conflicts when trying to merge the Master branch to a branch I was currently working...
  • AlexKaras's avatar
    AlexKaras
    4 years ago

    Hi,

     

    Files that are part of TestComplete's project (except script units to certain extent) must not be merged and must be considered as binaries.

    Thus your best bet is to rollback all files to last known good state and then manually in TestComplete apply all changes made since that time.

     

  • AlexKaras's avatar
    AlexKaras
    4 years ago

    Hi,

     

    > In regards t any other file than scripts I should include them in gitignore file?

    No... https://support.smartbear.com/testcomplete/docs/working-with/integration/scc/files.html help article describes what files must be added to the source control system (SCS) in order TestComplete can open the project and work with it.

    Only files that are not added to the SCS (last paragraph of the referenced article) may be added to the .gitignore file.

    But you should either mark all TestComplete files (except script ones) added to the SCS as non-mergeable / binary (if this is supported by the given SCS), or do not allow SCS engine to merge conflicted files and resolve conflicts manually in TestComplete IDE. Unfortunately, TestComplete does not provide clear information about what caused conflict and how to resolve it, so you will have to carefully read files difference report provided by the SCS and try to understand the reason of conflict.

    The general rule is : Save the project immediately after you change something in the project's structure (add project variable, change something in NameMapping / Aliasing, change something in the Execution Plan, etc.) and provide the changed project to all your team members.

    Some changes may be not synchronized. For example, you and your colleague each may add a keyword test to your copies of test project and work on your own test. But then, you will have to select what project (yours or the project of your colleague) will be the 'master' one and add missing keyword test to it. Then the other one must overwrite his project with the 'master' one in order to be in sync and continue to work. Projects' auto-merge most likely will result in corrupted project files.

     

AlexKaras's avatar
AlexKaras
Champion Level 3

Hi,

 

Files that are part of TestComplete's project (except script units to certain extent) must not be merged and must be considered as binaries.

Thus your best bet is to rollback all files to last known good state and then manually in TestComplete apply all changes made since that time.

 

ThatsRad's avatar
ThatsRad
New Contributor
4 years ago

Hi Alex,

 

Thank you for the reply. Sounds like a plan alright.

 

Would you be able to elaborate on "rollback all files". Not sure how to do this. If you could point me to a current online resource I should take it from there.

In regards t any other file than scripts I should include them in gitignore file? 

rollback all files

  • AlexKaras's avatar
    AlexKaras
    Champion Level 3
    4 years ago

    Hi,

     

    > In regards t any other file than scripts I should include them in gitignore file?

    No... https://support.smartbear.com/testcomplete/docs/working-with/integration/scc/files.html help article describes what files must be added to the source control system (SCS) in order TestComplete can open the project and work with it.

    Only files that are not added to the SCS (last paragraph of the referenced article) may be added to the .gitignore file.

    But you should either mark all TestComplete files (except script ones) added to the SCS as non-mergeable / binary (if this is supported by the given SCS), or do not allow SCS engine to merge conflicted files and resolve conflicts manually in TestComplete IDE. Unfortunately, TestComplete does not provide clear information about what caused conflict and how to resolve it, so you will have to carefully read files difference report provided by the SCS and try to understand the reason of conflict.

    The general rule is : Save the project immediately after you change something in the project's structure (add project variable, change something in NameMapping / Aliasing, change something in the Execution Plan, etc.) and provide the changed project to all your team members.

    Some changes may be not synchronized. For example, you and your colleague each may add a keyword test to your copies of test project and work on your own test. But then, you will have to select what project (yours or the project of your colleague) will be the 'master' one and add missing keyword test to it. Then the other one must overwrite his project with the 'master' one in order to be in sync and continue to work. Projects' auto-merge most likely will result in corrupted project files.

     

    • ThatsRad's avatar
      ThatsRad
      New Contributor
      4 years ago

      Hi Alex,

       

      That's plenty to take in! thank you very much for all the help.

      One more thing if you don't mind...

      Execution Plan / Organize Tests tab

      "After selecting it from the view option at the top menu it came back but most of it is greyed out now."

       

      Any idea on what is happening there?

      • AlexKaras's avatar
        AlexKaras
        Champion Level 3
        4 years ago

        Hi,

         

        > Any idea on what is happening there?

        Not really, though I am pretty sure that this is caused by incorrect merge of the project file (*.mds).

        Can you post a screenshot?

        Also I would recommend to create Support ticket via the https://support.smartbear.com/testcomplete/message/ form. I expect that Support guys will ask you for your project file and hopefully provide you with solution.

         

        P.S. One more thing that you may try is to execute the View | Desktop | Restore Default Docking main menu command. Though I am almost sure that this will not help...