Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 256FC10335 for ; Thu, 11 Jul 2013 22:10:18 +0000 (UTC) Received: (qmail 65319 invoked by uid 500); 11 Jul 2013 22:10:18 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 65298 invoked by uid 500); 11 Jul 2013 22:10:18 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 65285 invoked by uid 99); 11 Jul 2013 22:10:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jul 2013 22:10:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D15DC89423C; Thu, 11 Jul 2013 22:10:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org Date: Thu, 11 Jul 2013 22:10:17 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: [#6277] make forgeuserstats tmp repos not conflict with forgegit Updated Branches: refs/heads/db/6277 7bdac52fe -> d2a60bbbf (forced update) [#6277] make forgeuserstats tmp repos not conflict with forgegit Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d2a60bbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d2a60bbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d2a60bbb Branch: refs/heads/db/6277 Commit: d2a60bbbf547798b74a42ee87d68b6a26480a373 Parents: 3ec3fed Author: Dave Brondsema Authored: Tue May 28 10:32:26 2013 -0400 Committer: Dave Brondsema Committed: Thu Jul 11 22:10:00 2013 +0000 ---------------------------------------------------------------------- ForgeUserStats/forgeuserstats/tests/test_model.py | 5 +++-- ForgeUserStats/forgeuserstats/tests/test_stats.py | 8 ++++++-- run_tests | 4 ++++ 3 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d2a60bbb/ForgeUserStats/forgeuserstats/tests/test_model.py ---------------------------------------------------------------------- diff --git a/ForgeUserStats/forgeuserstats/tests/test_model.py b/ForgeUserStats/forgeuserstats/tests/test_model.py index 2203469..6940385 100644 --- a/ForgeUserStats/forgeuserstats/tests/test_model.py +++ b/ForgeUserStats/forgeuserstats/tests/test_model.py @@ -29,10 +29,11 @@ from allura.model import User, Project, TroveCategory from allura.lib import helpers as h from allura import model as M -from forgegit.tests import with_git - from forgeuserstats.model import stats as USM +test_project_with_repo = 'test2' # important to be distinct from 'test' which ForgeGit uses, so that the tests can run in parallel and not clobber each other +with_git = td.with_tool(test_project_with_repo, 'Git', 'src-git', 'Git', type='git') + class TestUserStats(unittest.TestCase): def setUp(self): http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d2a60bbb/ForgeUserStats/forgeuserstats/tests/test_stats.py ---------------------------------------------------------------------- diff --git a/ForgeUserStats/forgeuserstats/tests/test_stats.py b/ForgeUserStats/forgeuserstats/tests/test_stats.py index b2b20ce..bbb43f5 100644 --- a/ForgeUserStats/forgeuserstats/tests/test_stats.py +++ b/ForgeUserStats/forgeuserstats/tests/test_stats.py @@ -27,10 +27,14 @@ from allura.lib import helpers as h from allura.model import User from allura import model as M -from forgegit.tests import with_git from forgewiki import model as WM from forgetracker import model as TM + +test_project_with_repo = 'test2' # important to be distinct from 'test' which ForgeGit uses, so that the tests can run in parallel and not clobber each other +with_git = td.with_tool(test_project_with_repo, 'Git', 'src-git', 'Git', type='git') + + class TestStats(TestController): def setUp(self): @@ -185,7 +189,7 @@ class TestGitCommit(TestController, unittest.TestCase): @td.with_wiki def setup_with_tools(self): setup_global_objects() - h.set_context('test', 'src-git', neighborhood='Projects') + h.set_context(test_project_with_repo, 'src-git', neighborhood='Projects') repo_dir = pkg_resources.resource_filename( 'forgeuserstats', 'tests/data') c.app.repo.fs_path = repo_dir http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d2a60bbb/run_tests ---------------------------------------------------------------------- diff --git a/run_tests b/run_tests index 7d033b1..a85aefe 100755 --- a/run_tests +++ b/run_tests @@ -29,6 +29,8 @@ import textwrap def run_one(cmd, **popen_kwargs): print '{} running {} {}'.format(threading.current_thread(), cmd, popen_kwargs) + sys.stdout.flush() + all_popen_kwargs = dict(shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, bufsize=1, # 1 == line-buffered @@ -43,6 +45,8 @@ def run_one(cmd, **popen_kwargs): out_remainder, _ = proc.communicate() sys.stdout.write(out_remainder) sys.stdout.flush() + print 'finished {} {}'.format(cmd, popen_kwargs) + sys.stdout.flush() return proc