diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh index 283313776..d9341d7a2 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/ci_scripts/remote_tests_python.sh @@ -31,11 +31,12 @@ ssh $SSHTARGET <<_HERE export TARGET=release export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG - rm -rf virtualenv venv - virtualenv -q -p python3.7 venv - source venv/bin/activate + #we rely on tox/virtualenv being available in the host + #rm -rf virtualenv venv + #virtualenv -q -p python3.7 venv + #source venv/bin/activate set -x - pip install -q tox virtualenv + #pip install -q tox virtualenv bash ci_scripts/run-python-test.sh _HERE diff --git a/src/imap.rs b/src/imap.rs index 4669abed9..e91509980 100644 --- a/src/imap.rs +++ b/src/imap.rs @@ -219,12 +219,12 @@ impl Imap { context.stock_string_repl_str2( StockMessage::ServerResponse, format!("{}:{}", imap_server, imap_port), - format!("{}", err), + err.to_string(), ) }; // IMAP connection failures are reported to users emit_event!(context, Event::ErrorNetwork(message)); - return Err(Error::ImapConnectionFailed(format!("{}", err))); + return Err(Error::ImapConnectionFailed(err.to_string())); } }; @@ -779,7 +779,7 @@ impl Imap { // typically also need to change the Insecure branch. IdleHandle::Secure(mut handle) => { if let Err(err) = handle.init().await { - return Err(Error::ImapIdleProtocolFailed(format!("{}", err))); + return Err(Error::ImapIdleProtocolFailed(err.to_string())); } let (idle_wait, interrupt) = handle.wait_with_timeout(timeout); @@ -817,13 +817,13 @@ impl Imap { // means that we waited long (with idle_wait) // but the network went away/changed self.trigger_reconnect(); - return Err(Error::ImapIdleProtocolFailed(format!("{}", err))); + return Err(Error::ImapIdleProtocolFailed(err.to_string())); } } } IdleHandle::Insecure(mut handle) => { if let Err(err) = handle.init().await { - return Err(Error::ImapIdleProtocolFailed(format!("{}", err))); + return Err(Error::ImapIdleProtocolFailed(err.to_string())); } let (idle_wait, interrupt) = handle.wait_with_timeout(timeout); @@ -861,7 +861,7 @@ impl Imap { // means that we waited long (with idle_wait) // but the network went away/changed self.trigger_reconnect(); - return Err(Error::ImapIdleProtocolFailed(format!("{}", err))); + return Err(Error::ImapIdleProtocolFailed(err.to_string())); } } }