Skip to content

Commit

Permalink
Merge branch 'a450555442607587_lot_auction_period_fix'
Browse files Browse the repository at this point in the history
  • Loading branch information
annawzz committed Oct 26, 2017
2 parents 5612484 + d6d18cf commit c6b0b4f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 1 addition & 3 deletions buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ parts = test
develop = .
extensions = mr.developer
find-links = http://op:[email protected]/op/
auto-checkout = openprocurement.api openprocurement.tender.core openprocurement.tender.belowthreshold openprocurement.tender.openua barbecue
auto-checkout = openprocurement.api openprocurement.tender.core openprocurement.tender.belowthreshold openprocurement.tender.openua

[sources]
openprocurement.api = git https://github.com/openprocurement/openprocurement.api.git branch=master
openprocurement.tender.core = git https://github.com/openprocurement/openprocurement.tender.core.git branch=master
openprocurement.tender.belowthreshold = git https://github.com/openprocurement/openprocurement.tender.belowthreshold.git branch=master
openprocurement.tender.openua = git https://github.com/openprocurement/openprocurement.tender.openua.git branch=master
barbecue = git https://github.com/openprocurement/barbecue.git branch=master


[test]
recipe = zc.recipe.egg:scripts
Expand Down
5 changes: 5 additions & 0 deletions openprocurement/tender/openuadefense/tests/lot_blanks.py
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,11 @@ def two_lot_2bid_on_first_and_1_on_second_awarding(self):

# for SECOND lot
lot_id = lots[1]
# check lots auction period
response = self.app.get('/tenders/{}/lots/{}'.format(tender_id, lot_id))
self.assertIn('auctionPeriod', response.json['data'])
self.assertIn('startDate', response.json['data']['auctionPeriod'])
self.assertNotIn('shouldStartAfter', response.json['data']['auctionPeriod'])
# get pending award
response = self.app.get('/tenders/{}/awards?acc_token={}'.format(tender_id, owner_token))
award_id = [i['id'] for i in response.json['data'] if i['status'] == 'pending' and i['lotID'] == lot_id][0]
Expand Down
1 change: 1 addition & 0 deletions versions.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[versions]
barbecue = 0.2
Jinja2 = 2.7.3
MarkupSafe = 0.23
PasteDeploy = 1.5.2
Expand Down

0 comments on commit c6b0b4f

Please sign in to comment.