snapstore-client

Merge ~twom/snapstore-client:better-login-prompt into snapstore-client:master

  1. Git
  2. lp:~twom/snapstore-client
  3. better-login-prompt
  4. Merge into master
Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: 850144c4fe01ca9d5defe17e58982dcdc9ab48f2
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/snapstore-client:better-login-prompt
Merge into: snapstore-client:master
Diff against target: 57 lines (+9/-5)
2 files modified
snapstore_client/logic/overrides.py (+3/-2)
snapstore_client/logic/tests/test_overrides.py (+6/-3)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+343173@code.launchpad.net

Commit message

Fix prompting for the correct executable name.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapstore_client/logic/overrides.py b/snapstore_client/logic/overrides.py
2index 68316dc..5749988 100644
3--- a/snapstore_client/logic/overrides.py
4+++ b/snapstore_client/logic/overrides.py
5@@ -20,7 +20,7 @@ logger = logging.getLogger(__name__)
6
7 def _log_credentials_error(e):
8 logger.error('%s', e)
9- logger.error('Try to "snapstore login" again.')
10+ logger.error('Try to "snapstore-client login" again.')
11
12
13 def _log_authorized_error():
14@@ -35,7 +35,8 @@ def _check_default_store(cfg):
15 # If the gw URL is configured then everything else should be too.
16 if not store.get('gw_url'):
17 logger.error(
18- 'No store configuration found. Have you run "snapstore login"?')
19+ 'No store configuration found. '
20+ 'Have you run "snapstore-client login"?')
21 return None
22 return store
23
24diff --git a/snapstore_client/logic/tests/test_overrides.py b/snapstore_client/logic/tests/test_overrides.py
25index b92c966..08a85af 100644
26--- a/snapstore_client/logic/tests/test_overrides.py
27+++ b/snapstore_client/logic/tests/test_overrides.py
28@@ -28,7 +28,8 @@ class OverridesTests(TestCase):
29 self.assertEqual(rc, 1)
30 self.assertEqual(
31 logger.output,
32- 'No store configuration found. Have you run "snapstore login"?\n')
33+ 'No store configuration found. '
34+ 'Have you run "snapstore-client login"?\n')
35
36 @responses.activate
37 def test_list_overrides(self):
38@@ -66,7 +67,8 @@ class OverridesTests(TestCase):
39 self.assertEqual(rc, 1)
40 self.assertEqual(
41 logger.output,
42- 'No store configuration found. Have you run "snapstore login"?\n')
43+ 'No store configuration found. '
44+ 'Have you run "snapstore-client login"?\n')
45
46 @responses.activate
47 def test_override(self):
48@@ -120,7 +122,8 @@ class OverridesTests(TestCase):
49 self.assertEqual(rc, 1)
50 self.assertEqual(
51 logger.output,
52- 'No store configuration found. Have you run "snapstore login"?\n')
53+ 'No store configuration found. '
54+ 'Have you run "snapstore-client login"?\n')
55
56 @responses.activate
57 def test_delete_override(self):

Subscribers

People subscribed via source and target branches

to all changes: