From 8d4b8936580c1cbc2c1907469b6267d6bc0065d7 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 22 Nov 2019 02:23:16 +0100
Subject: [PATCH] fix missing renames and tox dep

---
 ci_scripts/remote_tests_python.sh |  8 ++++++--
 ci_scripts/run-python-test.sh     |  3 ++-
 examples/simple.rs                | 11 ++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh
index d9341d7a2..49ab46453 100755
--- a/ci_scripts/remote_tests_python.sh
+++ b/ci_scripts/remote_tests_python.sh
@@ -35,8 +35,12 @@ ssh $SSHTARGET <<_HERE
     #rm -rf virtualenv venv
     #virtualenv -q -p python3.7 venv 
     #source venv/bin/activate
-    set -x
-
     #pip install -q tox virtualenv
+
+    set -x
+    which python
+    source \$HOME/venv/bin/activate
+    which python
+
     bash ci_scripts/run-python-test.sh 
 _HERE
diff --git a/ci_scripts/run-python-test.sh b/ci_scripts/run-python-test.sh
index f6aaf251e..9fc9a7744 100755
--- a/ci_scripts/run-python-test.sh
+++ b/ci_scripts/run-python-test.sh
@@ -19,4 +19,5 @@ rm -rf src/deltachat/__pycache__
 export PYTHONDONTWRITEBYTECODE=1
 
 # run python tests (tox invokes pytest to run tests in python/tests)
-tox -e lintdoc,py37 
+TOX_PARALLEL_NO_SPINNER=1 tox -p2 -e lint,doc
+tox -e py37
diff --git a/examples/simple.rs b/examples/simple.rs
index d4c88d31e..9fe8ade26 100644
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -11,7 +11,8 @@ use deltachat::configure::*;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::job::{
-    perform_imap_fetch, perform_imap_idle, perform_imap_jobs, perform_smtp_idle, perform_smtp_jobs,
+    perform_inbox_fetch, perform_inbox_idle, perform_inbox_jobs, perform_smtp_idle,
+    perform_smtp_jobs,
 };
 use deltachat::Event;
 
@@ -50,12 +51,12 @@ fn main() {
     let r1 = running.clone();
     let t1 = thread::spawn(move || {
         while *r1.read().unwrap() {
-            perform_imap_jobs(&ctx1);
+            perform_inbox_jobs(&ctx1);
             if *r1.read().unwrap() {
-                perform_imap_fetch(&ctx1);
+                perform_inbox_fetch(&ctx1);
 
                 if *r1.read().unwrap() {
-                    perform_imap_idle(&ctx1);
+                    perform_inbox_idle(&ctx1);
                 }
             }
         }
@@ -113,7 +114,7 @@ fn main() {
     println!("stopping threads");
 
     *running.clone().write().unwrap() = false;
-    deltachat::job::interrupt_imap_idle(&ctx);
+    deltachat::job::interrupt_inbox_idle(&ctx, true);
     deltachat::job::interrupt_smtp_idle(&ctx);
 
     println!("joining");