Fix upgraded assert_cmd usage

Author: palfrey

README.md

@@ -30,6 +30,6 @@ Database support
 Development
 -----------
 To test the Postgres/ODBC support do the following (on OS X):
-1. `docker run -P postgres -d` to get a PostgreSQL server running
+1. `docker run -P -d postgres` to get a PostgreSQL server running
 2. `brew install psqlodbc sqliteodbc`
 3. ``POSTGRES_SERVER=localhost POSTGRES_PORT=32768 POSTGRES_USERNAME=postgres POSTGRES_PASSWORD= RUST_BACKTRACE=1 POSTGRES_DRIVER=`brew --prefix psqlodbc`/lib/psqlodbca.so SQLITE_DRIVER=`brew --prefix sqliteodbc`/lib/libsqlite3odbc-0.9996.dylib cargo test -- --nocapture``

tests/cli.rs

@@ -1,13 +1,12 @@
-use assert_cmd::prelude::*;
+use assert_cmd::Command;
 use predicates::prelude::*;
-use std::process::Command;
 
 extern crate wait_for_db;
 
 #[test]
 #[cfg_attr(postgres_driver = "", ignore)]
 fn command_line_timeout_with_odbc() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::main_binary()?;
+    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
     cmd.arg("--timeout=1")
         .arg("--mode=odbc")
         .arg(format!(
@@ -27,7 +26,7 @@ fn command_line_timeout_with_odbc() -> Result<(), Box<dyn std::error::Error>> {
 #[test]
 #[cfg_attr(postgres_driver = "", ignore)]
 fn command_line_timeout_with_postgres() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::main_binary()?;
+    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
     cmd.arg("--timeout=1")
         .arg("--mode=postgres")
         .arg(format!(