diff options
Diffstat (limited to 'git_review/tests/__init__.py')
| -rw-r--r-- | git_review/tests/__init__.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/git_review/tests/__init__.py b/git_review/tests/__init__.py index 8652d42..379ac86 100644 --- a/git_review/tests/__init__.py +++ b/git_review/tests/__init__.py @@ -197,7 +197,7 @@ class BaseGitReviewTestCase(testtools.TestCase, GerritHelpers): Require Gerrit war file in the .gerrit directory to run Gerrit local. """ super(BaseGitReviewTestCase, self).setUp() - self.useFixture(fixtures.Timeout(2 * 60, True)) + self.useFixture(fixtures.Timeout(5 * 60, True)) # ensures git-review command runs in local mode (for functional tests) self.useFixture( @@ -313,13 +313,25 @@ class BaseGitReviewTestCase(testtools.TestCase, GerritHelpers): utils.run_cmd(gerrit_sh, 'start') self.addCleanup(utils.run_cmd, gerrit_sh, 'stop') - def _simple_change(self, change_text, commit_message, - file_=None): - """Helper method to create small changes and commit them.""" + def _unstaged_change(self, change_text, file_=None): + """Helper method to create small changes and not stage them.""" if file_ is None: file_ = self._dir('test', 'test_file.txt') + utils.write_to_file(file_, ''.encode()) + self._run_git('add', file_) utils.write_to_file(file_, change_text.encode()) + + def _uncommitted_change(self, change_text, file_=None): + """Helper method to create small changes and not commit them.""" + if file_ is None: + file_ = self._dir('test', 'test_file.txt') + self._unstaged_change(change_text, file_) self._run_git('add', file_) + + def _simple_change(self, change_text, commit_message, + file_=None): + """Helper method to create small changes and commit them.""" + self._uncommitted_change(change_text, file_) self._run_git('commit', '-m', commit_message) def _simple_amend(self, change_text, file_=None): |