cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 06fe784
Date Wed, 27 Jan 2016 11:03:47 GMT
Merge pull request #1240 from shapeblue/master-9161

CLOUDSTACK-9161: fix the quota marvin test  1. Create a dummy user, as existing user may already
have stale quota
  data
  2. fix the tests to use the dummy user
  3. a boundary condition was revealed and fixed for a new user where
  quota service has never run and created bootstrap entries

* pr/1240:
  CLOUDSTACK-9161: fix the quota marvin test

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06fe7844
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06fe7844
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06fe7844

Branch: refs/heads/master
Commit: 06fe7844db239225e0125dd2617d63a0f2fd3925
Parents: ee2bc82 ccd0f22
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Jan 27 12:03:28 2016 +0100
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Jan 27 12:03:28 2016 +0100

----------------------------------------------------------------------
 .../cloudstack/quota/QuotaManagerImpl.java      |   4 +-
 .../cloudstack/quota/vo/QuotaBalanceVO.java     |  10 +-
 .../api/response/QuotaResponseBuilderImpl.java  |   2 +-
 test/integration/plugins/test_quota.py          | 267 +++++++++++++++++++
 test/integration/smoke/test_quota.py            | 204 --------------
 tools/marvin/marvin/config/setup.cfg            |   4 +
 6 files changed, 282 insertions(+), 209 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06fe7844/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
----------------------------------------------------------------------


Mime
View raw message