Merge branch 'master' into vulcand-tests

# Conflicts: # tests/test_sidekick.py
a5huynh · Feb 12, 2016 · fbb3eb3 · fbb3eb3
2 parents 88fa080 + e5f66e7
commit fbb3eb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/sidekick.py b/sidekick.py
@@ -3,7 +3,7 @@
 # @Author: ahuynh
 # @Date:   2015-06-10 16:51:36
 # @Last Modified by:   ahuynh
-# @Last Modified time: 2016-02-11 16:04:41
+# @Last Modified time: 2016-02-11 16:36:44
 '''
     The sidekick should essentially replace job of the following typical
     bash script that is used to announce a service to ETCD.
@@ -241,7 +241,7 @@ def main():
 
     # Connect to ECTD
     etcd_client = etcd.Client( host=args.etcd_host, port=args.etcd_port )
-    etcd_folder = os.path.join( args.prefix, args.name )
+    etcd_folder = os.path.join( args.prefix, args.domain )
     logger.debug( 'Announcing to {}'.format( etcd_folder ) )
 
     # Find the matching container

diff --git a/tests/test_sidekick.py b/tests/test_sidekick.py
@@ -3,7 +3,7 @@
 # @Author: ahuynh
 # @Date:   2015-06-18 20:15:30
 # @Last Modified by:   ahuynh
-# @Last Modified time: 2016-02-11 14:31:01
+# @Last Modified time: 2016-02-11 16:41:47
 import unittest
 
 from sidekick import announce_services, check_name, find_matching_container
@@ -17,7 +17,6 @@ class TestSidekick( unittest.TestCase ):
     def setUp( self ):
 
         self.args = parse_args( [ '--name', 'test', '--ip', 'localhost', '--check-ip', '0.0.0.0' ] )
-
         self.etcd_client  = MockEtcd()
 
         self.container = {