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 66EFBFB33 for ; Mon, 8 Apr 2013 15:19:06 +0000 (UTC) Received: (qmail 30002 invoked by uid 500); 8 Apr 2013 15:19:04 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 29951 invoked by uid 500); 8 Apr 2013 15:19:04 -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 29885 invoked by uid 99); 8 Apr 2013 15:19:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Apr 2013 15:19:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 64DAF50DD6; Mon, 8 Apr 2013 15:19:04 +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: Mon, 08 Apr 2013 15:19:37 -0000 Message-Id: <2eb390db81da4d6ba9f19bd29e40bd8f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] git commit: [#5453] Fixing errors in userstats [#5453] Fixing errors in userstats Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/91774b52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/91774b52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/91774b52 Branch: refs/heads/db/6007 Commit: 91774b525612211c2424a720ec9a182c6351d85f Parents: 43731d3 Author: Stefano Invernizzi Authored: Wed Mar 13 01:25:10 2013 +0100 Committer: Dave Brondsema Committed: Thu Apr 4 18:37:37 2013 +0000 ---------------------------------------------------------------------- ForgeUserStats/forgeuserstats/model/stats.py | 4 --- ForgeUserStats/forgeuserstats/tests/test_model.py | 23 +++++++-------- 2 files changed, 11 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/91774b52/ForgeUserStats/forgeuserstats/model/stats.py ---------------------------------------------------------------------- diff --git a/ForgeUserStats/forgeuserstats/model/stats.py b/ForgeUserStats/forgeuserstats/model/stats.py index 4171d52..b2f70a4 100644 --- a/ForgeUserStats/forgeuserstats/model/stats.py +++ b/ForgeUserStats/forgeuserstats/model/stats.py @@ -25,10 +25,6 @@ class UserStats(Stats): stats = cls(user_id=user._id, registration_date = datetime.utcnow()) user.stats_id = stats._id - if session(stats): - session(stats).flush(stats) - if session(user): - session(user).flush(user) return stats def getLastMonthLogins(self): http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/91774b52/ForgeUserStats/forgeuserstats/tests/test_model.py ---------------------------------------------------------------------- diff --git a/ForgeUserStats/forgeuserstats/tests/test_model.py b/ForgeUserStats/forgeuserstats/tests/test_model.py index 3a9fcde..1f0236e 100644 --- a/ForgeUserStats/forgeuserstats/tests/test_model.py +++ b/ForgeUserStats/forgeuserstats/tests/test_model.py @@ -18,9 +18,8 @@ class TestUserStats(unittest.TestCase): setup_basic_test() setup_global_objects() - self.user = User.register(dict(username='test-new-user', - display_name='Test Stats'), - make_project=False) + self.user = User.by_username('test-user-2') + c.user = self.user def test_init_values(self): artifacts = self.user.stats.getArtifacts() @@ -49,9 +48,9 @@ class TestUserStats(unittest.TestCase): assert lmcommits['number'] == 0 assert lmcommits['lines'] == 0 - @td.with_user_project('test-new-user') + @td.with_user_project('test-user-2') def test_create_artifact_stats(self): - p = Project.query.get(shortname='u/test-new-user') + p = Project.query.get(shortname='u/test-user-2') topic = TroveCategory.query.get(shortname='scientific') init_lm_art = self.user.stats.getLastMonthArtifacts() @@ -126,9 +125,9 @@ class TestUserStats(unittest.TestCase): art_by_cat = self.user.stats.getArtifactsByCategory(detailed=False) assert art_by_cat[topic]['created'] == 1 and art_by_cat[topic]['modified'] == 0 - @td.with_user_project('test-new-user') + @td.with_user_project('test-user-2') def test_modify_artifact_stats(self): - p = Project.query.get(shortname='u/test-new-user') + p = Project.query.get(shortname='u/test-user-2') topic = TroveCategory.query.get(shortname='scientific') init_lm_art = self.user.stats.getLastMonthArtifacts() @@ -203,9 +202,9 @@ class TestUserStats(unittest.TestCase): art_by_cat = self.user.stats.getArtifactsByCategory(detailed=False) assert art_by_cat[topic]['created'] == 0 and art_by_cat[topic]['modified'] == 1 - @td.with_user_project('test-new-user') + @td.with_user_project('test-user-2') def test_ticket_stats(self): - p = Project.query.get(shortname='u/test-new-user') + p = Project.query.get(shortname='u/test-user-2') topic = TroveCategory.query.get(shortname='scientific') create_time = datetime.utcnow() + timedelta(-5) @@ -299,9 +298,9 @@ class TestUserStats(unittest.TestCase): assert lm_by_cat[topic]['averagesolvingtime'] == solving_time @with_git - @td.with_user_project('test-new-user') + @td.with_user_project('test-user-2') def test_commit_stats(self): - p = Project.query.get(shortname='u/test-new-user') + p = Project.query.get(shortname='u/test-user-2') topic = TroveCategory.query.get(shortname='scientific') commit_time = datetime.utcnow() + timedelta(-1) @@ -353,7 +352,7 @@ class TestUserStats(unittest.TestCase): assert lm_by_cat[topic]['number'] == 1 assert lm_by_cat[topic]['lines'] == 1 - @td.with_user_project('test-new-user') + @td.with_user_project('test-user-2') def test_login_stats(self): init_logins = self.user.stats.tot_logins_count init_lm_logins = self.user.stats.getLastMonthLogins()