Fixed #31, added test

tomasbedrich · Aug 24, 2015 · 1ce532f · 1ce532f
1 parent c8d349b
commit 1ce532f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/pycaching/geocaching.py b/pycaching/geocaching.py
@@ -402,7 +402,8 @@ def load_cache_quick(self, wp, destination=None):
             raise Error("Cannot load quick cache details page.") from e
 
         if res["status"] == "failed" or len(res["data"]) != 1:
-            raise LoadError("Waypoint '{}' cannot be loaded: {}".format(wp, res["msg"]))
+            error_msg = res["msg"] if "msg" in res else "Unknown error (probably not existing cache)"
+            raise LoadError("Waypoint '{}' cannot be loaded: {}".format(wp, error_msg))
 
         data = res["data"][0]
 

diff --git a/test/test_geocaching.py b/test/test_geocaching.py
@@ -193,9 +193,15 @@ def test_load_cache(self):
                 self.g.load_cache("GC3AHDM")
 
     def test_load_cache_quick(self):
-        cache = self.g.load_cache_quick("GC4808G")
-        self.assertTrue(isinstance(cache, Cache))
-        self.assertEqual("GC4808G", cache.wp)
+        with self.subTest("normal"):
+            cache = self.g.load_cache_quick("GC4808G")
+            self.assertTrue(isinstance(cache, Cache))
+            self.assertEqual("GC4808G", cache.wp)
+
+        with self.subTest("fail"):
+            with self.assertRaises(pycaching.errors.LoadError):
+                cache = self.g.load_cache_quick("GC123456")
+
 
     def test_load_trackable(self):
         trackable = self.g.load_trackable("TB1KEZ9")