Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Non-numeric link alias #364

Merged
merged 3 commits into from
Sep 4, 2014
+68 −23
Merged

Non-numeric link alias #364

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73bd4ac
Use hostnames everywhere in docs, add YAML note and deprecate env.md
aanand Aug 8, 2014
62a4d21
Default link alias which is just the service name
aanand Jul 29, 2014
59e31ff
Update docs to remove numeric suffix
aanand Aug 8, 2014
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
Prev Previous commit
Next Next commit
Default link alias which is just the service name 
Closes #37.

Signed-off-by: Aanand Prasad <[email protected]>
@aanand
aanand committed Aug 8, 2014
commit 62a4d214e8bebf94e43f01be7ee7c997fc34da79
4 changes: 2 additions & 2 deletions fig/service.py
View file
Original file line number Diff line number Diff line change
@@ -282,12 +282,12 @@ def _get_links(self, link_to_self):
links = []
for service, link_name in self.links:
for container in service.containers():
if link_name:
links.append((container.name, link_name))
links.append((container.name, link_name or service.name))
links.append((container.name, container.name))
links.append((container.name, container.name_without_project))
if link_to_self:
for container in self.containers():
links.append((container.name, self.name))
links.append((container.name, container.name))
links.append((container.name, container.name_without_project))
return links
51 changes: 42 additions & 9 deletions tests/integration/service_test.py
View file
Original file line number Diff line number Diff line change
@@ -171,29 +171,62 @@ def test_start_container_inherits_options_from_constructor(self):
def test_start_container_creates_links(self):
db = self.create_service('db')
web = self.create_service('web', links=[(db, None)])

db.start_container()
db.start_container()
web.start_container()
self.assertIn('figtest_db_1', web.containers()[0].links())
self.assertIn('db_1', web.containers()[0].links())

self.assertEqual(
set(web.containers()[0].links()),
set([
'figtest_db_1', 'db_1',
'figtest_db_2', 'db_2',
'db',
]),
)

def test_start_container_creates_links_with_names(self):
db = self.create_service('db')
web = self.create_service('web', links=[(db, 'custom_link_name')])

db.start_container()
db.start_container()
web.start_container()
self.assertIn('custom_link_name', web.containers()[0].links())

self.assertEqual(
set(web.containers()[0].links()),
set([
'figtest_db_1', 'db_1',
'figtest_db_2', 'db_2',
'custom_link_name',
]),
)

def test_start_normal_container_does_not_create_links_to_its_own_service(self):
db = self.create_service('db')
c1 = db.start_container()
c2 = db.start_container()
self.assertNotIn(c1.name, c2.links())

db.start_container()
db.start_container()

c = db.start_container()
self.assertEqual(set(c.links()), set([]))

def test_start_one_off_container_creates_links_to_its_own_service(self):
db = self.create_service('db')
c1 = db.start_container()
c2 = db.start_container(one_off=True)
self.assertIn(c1.name, c2.links())

db.start_container()
db.start_container()

c = db.start_container(one_off=True)

self.assertEqual(
set(c.links()),
set([
'figtest_db_1', 'db_1',
'figtest_db_2', 'db_2',
'db',
]),
)

def test_start_container_builds_images(self):
service = Service(