From 463c0195f7ade6b4e1692568d1d71a8b63787f80 Mon Sep 17 00:00:00 2001
From: Germar Reitze <germar.reitze@gmail.com>
Date: Sun, 11 Aug 2019 21:50:31 +0200
Subject: [PATCH] Fix bug: TypeError in backintime.py if mount failed while
 running a snapshot (fixes #1005)

---
 CHANGES                    |  3 +++
 common/snapshots.py        |  2 +-
 common/test/test_backup.py | 18 +++++++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index c970eba5..5a5fb93e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Back In Time
 
+Version 1.2.1
+* Fix bug: TypeError in backintime.py if mount failed while running a snapshot (https://github.com/bit-team/backintime/issues/1005)
+
 Version 1.2.0
 * Fix bug: Exit code is linked to the wrong status message (https://github.com/bit-team/backintime/issues/906)
 * minor changes to allow running BiT inside Docker (https://github.com/bit-team/backintime/pull/959)
diff --git a/common/snapshots.py b/common/snapshots.py
index 14228281..39f4df77 100644
--- a/common/snapshots.py
+++ b/common/snapshots.py
@@ -646,7 +646,7 @@ def backup(self, force = False):
                     instance.exitApplication()
                     logger.info('Unlock', self)
                     time.sleep(2)
-                    return False, True
+                    return True
                 else:
                     self.config.setCurrentHashId(hash_id)
 
diff --git a/common/test/test_backup.py b/common/test/test_backup.py
index 46f17b6c..8a2dd0a5 100644
--- a/common/test/test_backup.py
+++ b/common/test/test_backup.py
@@ -36,7 +36,7 @@ class TestBackup(generic.SnapshotsTestCase):
     @patch('snapshots.Snapshots.takeSnapshot')
     def test_backup(self, takeSnapshot, sleep):
         takeSnapshot.return_value = [True, False]
-        self.assertFalse(self.sn.backup())
+        self.assertIs(self.sn.backup(), False)
 
         self.assertEqual(takeSnapshot.call_count, 1)
         self.assertIsInstance(takeSnapshot.call_args[0][0], snapshots.SID)
@@ -47,7 +47,7 @@ def test_backup(self, takeSnapshot, sleep):
     @patch('snapshots.Snapshots.takeSnapshot')
     def test_no_changes(self, takeSnapshot, sleep):
         takeSnapshot.return_value = [False, False]
-        self.assertFalse(self.sn.backup())
+        self.assertIs(self.sn.backup(), False)
         self.assertTrue(takeSnapshot.called)
 
         sid = takeSnapshot.call_args[0][0]
@@ -59,7 +59,7 @@ def test_no_changes(self, takeSnapshot, sleep):
     @patch('snapshots.Snapshots.takeSnapshot')
     def test_with_errors(self, takeSnapshot, sleep):
         takeSnapshot.return_value = [False, True]
-        self.assertTrue(self.sn.backup())
+        self.assertIs(self.sn.backup(), True)
 
     @patch('time.sleep') # speed up unittest
     @patch('tools.onBattery')
@@ -113,7 +113,7 @@ def test_scheduled(self, takeSnapshot, sleep):
     def test_already_running(self, takeSnapshot, check, sleep):
         check.return_value = False
         takeSnapshot.return_value = [True, False]
-        self.assertTrue(self.sn.backup())
+        self.assertIs(self.sn.backup(), True)
         self.assertFalse(takeSnapshot.called)
 
     @patch('time.sleep') # speed up unittest
@@ -122,7 +122,7 @@ def test_already_running(self, takeSnapshot, check, sleep):
     def test_plugin_prevented_backup(self, takeSnapshot, processBegin, sleep):
         processBegin.return_value = False
         takeSnapshot.return_value = [True, False]
-        self.assertTrue(self.sn.backup())
+        self.assertIs(self.sn.backup(), True)
         self.assertFalse(takeSnapshot.called)
 
     @patch('time.sleep') # speed up unittest
@@ -131,7 +131,7 @@ def test_plugin_prevented_backup(self, takeSnapshot, processBegin, sleep):
     def test_not_configured(self, takeSnapshot, isConfigured, sleep):
         isConfigured.return_value = False
         takeSnapshot.return_value = [True, False]
-        self.assertTrue(self.sn.backup())
+        self.assertIs(self.sn.backup(), True)
         self.assertFalse(takeSnapshot.called)
 
     @patch('time.sleep') # speed up unittest
@@ -140,7 +140,7 @@ def test_not_configured(self, takeSnapshot, isConfigured, sleep):
     def test_mount_exception(self, takeSnapshot, mount, sleep):
         mount.side_effect = MountException()
         takeSnapshot.return_value = [True, False]
-        self.assertTrue(self.sn.backup())
+        self.assertIs(self.sn.backup(), True)
         self.assertFalse(takeSnapshot.called)
 
     @patch('time.sleep') # speed up unittest
@@ -149,7 +149,7 @@ def test_mount_exception(self, takeSnapshot, mount, sleep):
     def test_umount_exception(self, takeSnapshot, umount, sleep):
         umount.side_effect = MountException()
         takeSnapshot.return_value = [True, False]
-        self.assertFalse(self.sn.backup())
+        self.assertIs(self.sn.backup(), False)
 
     @patch('time.sleep') # speed up unittest
     @patch.object(config.Config, 'canBackup')
@@ -157,7 +157,7 @@ def test_umount_exception(self, takeSnapshot, umount, sleep):
     def test_cant_backup(self, takeSnapshot, canBackup, sleep):
         canBackup.return_value = False
         takeSnapshot.return_value = [True, False]
-        self.assertTrue(self.sn.backup())
+        self.assertIs(self.sn.backup(), True)
         self.assertFalse(takeSnapshot.called)
 
     @patch('time.sleep') # speed up unittest