Change bldr/simple_service references to test/simple_service

tests/bldr/key.rs

@@ -23,7 +23,7 @@ fn upload_a_key_and_install_it() {
     setup::gpg_import();
     setup::simple_service();
 
-    let d = docker::repo("bldr/simple_service");
+    let d = docker::repo("test/simple_service");
     let ipaddress = d.ipaddress();
 
     let mut upload = command::bldr(&["key-upload", &util::path::fixture_as_string("chef-public"), "-u", &format!("http://{}:9632", ipaddress)]).unwrap();

tests/bldr/repo.rs

@@ -24,7 +24,7 @@ fn upload_a_package_and_then_install_it() {
     setup::key_install();
     setup::simple_service();
 
-    let d = docker::repo("bldr/simple_service");
+    let d = docker::repo("test/simple_service");
     let ipaddress = d.ipaddress();
 
     let mut upload = command::bldr(&["upload", "simple_service", "-u", &format!("http://{}:9632", ipaddress)]).unwrap();

tests/bldr/start.rs

@@ -25,7 +25,7 @@ fn standalone_no_options() {
     setup::gpg_import();
     setup::simple_service();
 
-    let d = docker::run("bldr/simple_service");
+    let d = docker::run("test/simple_service");
     if d.wait_until(r"Shipping out to Boston") {
         let output = d.logs();
         assert_regex!(&output, r"Starting (.+)");
@@ -37,7 +37,7 @@ fn standalone_with_environment_config() {
     setup::gpg_import();
     setup::simple_service();
 
-    let d = docker::run_with_env("bldr/simple_service", "BLDR_simple_service=setting=\"blarg\"");
+    let d = docker::run_with_env("test/simple_service", "BLDR_simple_service=setting=\"blarg\"");
     if d.wait_until(r"End Configuration") {
         let output = d.logs();
         assert_regex!(&output, r"setting: blarg");
@@ -52,7 +52,7 @@ fn standalone_with_discovery_config() {
     util::discovery::clear("config");
     util::discovery::set("config", "setting = \"sepultura\"");
 
-    let d = docker::run_with_etcd("bldr/simple_service");
+    let d = docker::run_with_etcd("test/simple_service");
     assert_docker_log!(d, r"setting: sepultura");
 }
 
@@ -64,7 +64,7 @@ fn standalone_with_discovery_config_updates() {
     util::discovery::clear("config");
 
     util::discovery::set("config", "setting = \"sepultura\"");
-    let d = docker::run_with_etcd("bldr/simple_service");
+    let d = docker::run_with_etcd("test/simple_service");
     assert_docker_log!(d, r"setting: sepultura");
 
     util::discovery::set("config", "setting = \"against me!\"");
@@ -80,9 +80,9 @@ fn leader_with_discovery() {
     util::discovery::clear("topology");
 
     util::discovery::set("config", "setting = \"rustacean\"");
-    let d1 = docker::run_with_etcd_topology("bldr/simple_service", "leader");
-    let d2 = docker::run_with_etcd_topology("bldr/simple_service", "leader");
-    let d3 = docker::run_with_etcd_topology("bldr/simple_service", "leader");
+    let d1 = docker::run_with_etcd_topology("test/simple_service", "leader");
+    let d2 = docker::run_with_etcd_topology("test/simple_service", "leader");
+    let d3 = docker::run_with_etcd_topology("test/simple_service", "leader");
 
     assert_docker_log_count!(1, "Starting my term as leader", [ d1, d2, d3 ]);
     assert_docker_log_count!(2, "Becoming a follower", [ d1, d2, d3 ]);

tests/util/discovery.rs

@@ -22,7 +22,7 @@ use url;
 use std::thread;
 
 pub fn clear(key: &str) {
-    let url = format!("http://etcd:4001/v2/keys/bldr/simple_service/{}/{}?recursive=true", thread::current().name().unwrap_or("main"), key);
+    let url = format!("http://etcd:4001/v2/keys/test/simple_service/{}/{}?recursive=true", thread::current().name().unwrap_or("main"), key);
     let client = Client::new();
     let request = client.delete(&url);
     let res = request.send().unwrap_or_else(|x| panic!("Error: {:?}; Failed to delete {}", x, url));
@@ -33,7 +33,7 @@ pub fn clear(key: &str) {
 }
 
 pub fn set(key: &str, body: &str) {
-    let url = format!("http://etcd:4001/v2/keys/bldr/simple_service/{}/{}", thread::current().name().unwrap_or("main"), key);
+    let url = format!("http://etcd:4001/v2/keys/test/simple_service/{}/{}", thread::current().name().unwrap_or("main"), key);
     let client = Client::new();
     let req_options = vec![("value", body)];
     let req_body = url::form_urlencoded::serialize(&req_options);

tests/util/docker.rs

@@ -53,7 +53,7 @@ pub fn run_with_etcd_topology(image: &str, topology: &str) -> Docker {
 
 impl Docker {
     pub fn ipaddress(&self) -> String {
-        let mut cmd = command::run("sh", &["-c", &format!(r#"docker inspect {} | grep \"IPAddress\" | awk 'BEGIN {{ FS = "\"" }}; {{ printf $4 }}'"#, &self.container_id)]).unwrap_or_else(|x| panic!("{:?}", x));
+        let mut cmd = command::run("sh", &["-c", &format!("docker inspect --format='{}' {}", "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}", &self.container_id)]).unwrap_or_else(|x| panic!("{:?}", x));
         cmd.wait_with_output();
         let ipaddress = String::from(cmd.stdout());
         println!("I have ipaddress of {}", &cmd.stdout());