Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
options.find_links or
('http://downloads.buildout.org/'
if options.accept_buildout_test_releases else None)
)
)
if find_links:
cmd.extend(['-f', find_links])

Expand Down Expand Up @@ -207,4 +207,5 @@ def _final_version(parsed_version):
args[0:0] = ['-c', options.config_file]

zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
shutil.rmtree(tmpeggs)

18 changes: 12 additions & 6 deletions internal_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ def test_01_general_workflow(self):
# Move assets to pending ==============================================
for asset in assets:
asset_id = asset.data.id
self.assets_client.patch_asset(asset.data.id, {"data": {"status": "pending"}}, asset.access.token)
self.assets_client.patch_asset(
asset.data.id, {"data": {"status": "pending"}}, asset.access.token)
self.assertEqual(self.assets_client.get_asset(asset_id).data.status,
"pending")

Expand All @@ -152,14 +153,18 @@ def test_01_general_workflow(self):
print "Successfully created lot [{}]".format(lot.data.id)

# Move lot to Pending =================================================
self.lots_client.patch_lot(lot.data.id, {"data": {"status": "pending"}}, lot.access.token)
self.assertEqual(self.lots_client.get_lot(lot.data.id).data.status, "pending")
self.lots_client.patch_lot(
lot.data.id, {"data": {"status": "pending"}}, lot.access.token)
self.assertEqual(self.lots_client.get_lot(
lot.data.id).data.status, "pending")

print "Moved lot to 'pending' status"

# Move lot to Verification ============================================
self.lots_client.patch_lot(lot.data.id, {"data": {"status": "verification"}}, lot.access.token)
self.assertEqual(self.lots_client.get_lot(lot.data.id).data.status, "verification")
self.lots_client.patch_lot(
lot.data.id, {"data": {"status": "verification"}}, lot.access.token)
self.assertEqual(self.lots_client.get_lot(
lot.data.id).data.status, "verification")

print "Moved lot to 'verification' status"

Expand Down Expand Up @@ -218,7 +223,8 @@ def test_01_general_workflow(self):
# print "Convoy has moved lot to 'active.salable' status and done his work!"

# Move lot to dissolved status ========================================
self.lots_client.patch_lot(lot.data.id, {"data": {"status": "pending.dissolution"}}, lot.access.token)
self.lots_client.patch_lot(
lot.data.id, {"data": {"status": "pending.dissolution"}}, lot.access.token)
lot_status = self.lots_client.get_lot(lot.data.id).data.status
self.assertEqual(lot_status, "pending.dissolution")

Expand Down
2 changes: 1 addition & 1 deletion profiles/development.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ input = inline:
#!/bin/bash
find -L src -type f -regex ".*\.py" | xargs bin/pylint-bin $@
output = ${buildout:directory}/bin/pylint
mode = 755
mode = 755
8 changes: 6 additions & 2 deletions start.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import ConfigParser, os, uuid, subprocess
import ConfigParser
import os
import uuid
import subprocess


cur_dir = os.path.dirname(__file__)
Expand All @@ -12,4 +15,5 @@
with open(couchdb_ini_file_path, 'wb') as configfile:
config.write(configfile)

subprocess.check_call([os.path.join(cur_dir, 'bin/circusd'), "--daemon"])
subprocess.check_call([os.path.join(cur_dir, 'bin/circusd'), "--daemon"])

2 changes: 1 addition & 1 deletion templates/couchdb.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ delayed_commits = false
[admins]
${options['username']} = ${options['password']}
{% if 'munin' in options %}munin = ${options['munin']}{% end %}
{% end %}
{% end %}