Subject: 2 timestamp fields in TestExecution class #1924

[APiligrim]

This commit is part of the issue #1924 where Kiwi TCMS needs additional fields for the TestExecution class. This is a prerequisite for time tracking features & telemetry. Here are the changes that this commit is trying to make:

• New field TestExecution.start_date of type DateTimeField(db_index=True, null=True, blank=True)

• Renamed the TestExecution.close_date to TestExecution.stop_date and add db_index=True

• Added a new property TestExecution.actual_duration - the difference between the 2 fields

• Added a new property TestExecution.expected_duration -> self.case.expected_duration; for convenience, see 2 duration fields in TestCase class #1923

• API method TestExecution.update() supports the new start_date and close_ date fields

[atodorov]

• Run manage.py makemigrations & squash all commits together, see http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
• See https://chris.beams.io/posts/git-commit/ on info how to improve your commit log message
• See https://docs.github.com/en/enterprise/2.16/user/github/managing-your-work-on-github/closing-issues-using-keywords about how to reference existing issues in commit log

[APiligrim]

Im having some trouble😅 for some reason although I pulled from master, then ran manage.py makemigrations, made another commit and squashed it with all the previous ones I made, calling it "Add: New timestamp fields in TestExecution class .Refs #1924", its still trying to commit them twice. Also the commit with "Merge branch 'anastasiya-branch' of https://github.com/MLH-Fellowship… …" is not showing up when I search for it with rebase log. Do you have any advice on how I can delete the repeated commits that are showing up here? Thank you for all your help!

[atodorov]

Im having some troublesweat_smile for some reason although I pulled from master, then ran manage.py makemigrations, made another commit and squashed it with all the previous ones I made, calling it "Add: New timestamp fields in TestExecution class .Refs #1924", its still trying to commit them twice. Also the commit with "Merge branch 'anastasiya-branch' of https://github.com/MLH-Fellowship… …" is not showing up when I search for it with rebase log. Do you have any advice on how I can delete the repeated commits that are showing up here? Thank you for all your help!

The commit you see with "Merge branch ..." is called a merge commit, aka 3 way merge (https://hamwaves.com/collaboration/doc/rypress.com/branches-2.html search for 3-way merge).

This happened automatically when you did git pull b/c that means download the new commits and automatically merge them into the current branch. The workflow is usually a bit different:

git checkout master
git fetch upstream  <--- assumes you have another remote configured 
git merge upstream/master  <---- keeps the local master branch clean, performs a fast-forward merge without merge commits
git checkout <your_topic_branch>
git rebase -i master  <--- rebases onto the refreshed local master

Another option if the local master branch is not clean is to rebase against upstream/master after a fetch! (There are others as well).

Don't sweat it too much. The upstream branch is moving very rapidly but unless you need to rebase because of conflicts you can keep working against an older version as well.

[APiligrim]

Hi @atodorov! I renamed all the associated "close_date" vars to "stop_date" and I also removed the "case.expected_duration " which refers to #2253 and is b/c at the moment. I see more checks are passing but some are still failing so I'll explore some of those issues 👀

[atodorov]

Drop the last commit and focus on the other comments from the code review.

Renaming close_date to stop_date should be done where needed, not everywhere where this variable name occurs. As-is the last commit is creating more issues than it solves.

[atodorov]

See latest comments & squash all commits together.

[atodorov]

Minor changes requested!

• Squash commits and update commit log to match!

[atodorov]

LGTM, docker test failed for unrelated reasons.

As soon as it passes I will merge this PR, check the issue for the next steps.