allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [allura] branch master updated: Avoid git directory clashes in tests
Date Tue, 04 Jun 2019 15:34:10 GMT
This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/master by this push:
     new fd67f6c  Avoid git directory clashes in tests
fd67f6c is described below

commit fd67f6c70b343696e1312226f947f0e3ef768c6d
Author: Dave Brondsema <dave@brondsema.net>
AuthorDate: Tue Jun 4 11:33:43 2019 -0400

    Avoid git directory clashes in tests
---
 Allura/allura/tests/functional/test_personal_dashboard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Allura/allura/tests/functional/test_personal_dashboard.py b/Allura/allura/tests/functional/test_personal_dashboard.py
index 2d8f460..217c470 100644
--- a/Allura/allura/tests/functional/test_personal_dashboard.py
+++ b/Allura/allura/tests/functional/test_personal_dashboard.py
@@ -29,7 +29,6 @@ from allura.lib.widgets.user_profile import SectionsUtil
 from allura.tests import TestController
 from allura.tests import decorators as td
 from alluratest.controller import setup_global_objects, setup_unit_test
-from forgegit.tests import with_git
 from forgetracker.tests.functional.test_root import TrackerTestController
 
 
@@ -93,10 +92,11 @@ class TestMergeRequestsSection(TestController):
         mr= self.merge_request
         ThreadLocalODMSession.flush_all()
 
-    @with_git
+    # variation on @with_git but with different project to avoid clashes with other tests
using git
+    @td.with_tool('test2', 'Git', 'src-git', 'Git')
     def setup_with_tools(self):
         setup_global_objects()
-        h.set_context('test', 'src-git', neighborhood='Projects')
+        h.set_context('test2', 'src-git', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
             'forgegit', 'tests/data')
         c.app.repo.fs_path = repo_dir


Mime
View raw message