Merge pull request #408 from sergiusens/bugfix/1560553/login-error

Raise a nice error when downloading without a login
canonical · Mar 29, 2016 · 1b15b6a · 1b15b6a
2 parents b18e4e9 + 75f6794
commit 1b15b6a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/snapcraft/storeapi/_download.py b/snapcraft/storeapi/_download.py
@@ -29,6 +29,9 @@
 def download(snap, download_path, config, arch):
     """Download snap from the store to download_path"""
     session = get_oauth_session(config)
+    if session is None:
+        raise EnvironmentError(
+            'No valid credentials found. Have you run "snapcraft login"?')
 
     # TODO add release header
     session.headers.update({'X-Ubuntu-Architecture': arch})

diff --git a/snapcraft/tests/test_storeapi_download.py b/snapcraft/tests/test_storeapi_download.py
@@ -158,3 +158,13 @@ def test_snap_already_downloaded(self):
             call("Getting details for 'os'"),
             call("Already downloaded 'os'")])
         self.assertTrue(os.path.exists('os.snap'))
+
+    def test_download_fails_when_not_logged_in(self):
+        self.mock_get_oauth_session.return_value = None
+
+        with self.assertRaises(EnvironmentError) as raised:
+            download('os', 'os.snap', None, 'amd64')
+
+        self.assertEqual(
+            'No valid credentials found. Have you run "snapcraft login"?',
+            str(raised.exception))