Mercurial > hg
annotate tests/test-trusted.py @ 41585:549af2fa089f
tests: extract the http server authentication extension to a single module
We had 4 copy/pastes of this, and no coverage for http digests (which are
currently broken on py3).
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 05 Feb 2019 09:37:23 -0500 |
parents | 3028b4073be1 |
children | 2372284d9457 |
rev | line source |
---|---|
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 # Since it's not easy to write a test that portably deals |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 # with files from different users/groups, we cheat a bit by |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 # monkey-patching some functions in the util module |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 |
28934
c4040a35b5d9
tests: make test-trusted use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28913
diff
changeset
|
5 from __future__ import absolute_import, print_function |
28913
b4048ce003fb
tests: make test-trusted use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
26587
diff
changeset
|
6 |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
7 import os |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
8 import sys |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
9 |
28913
b4048ce003fb
tests: make test-trusted use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
26587
diff
changeset
|
10 from mercurial import ( |
b4048ce003fb
tests: make test-trusted use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
26587
diff
changeset
|
11 error, |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
12 pycompat, |
28913
b4048ce003fb
tests: make test-trusted use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
26587
diff
changeset
|
13 ui as uimod, |
b4048ce003fb
tests: make test-trusted use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
26587
diff
changeset
|
14 util, |
b4048ce003fb
tests: make test-trusted use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
26587
diff
changeset
|
15 ) |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
16 from mercurial.utils import stringutil |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
18 hgrc = os.environ['HGRCPATH'] |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
19 f = open(hgrc, 'rb') |
5523
5db730475d6d
tests/*: avoid losing the original settings from $HGRCPATH
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4516
diff
changeset
|
20 basehgrc = f.read() |
5db730475d6d
tests/*: avoid losing the original settings from $HGRCPATH
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4516
diff
changeset
|
21 f.close() |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
22 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
23 def _maybesysstr(v): |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
24 if isinstance(v, bytes): |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
25 return pycompat.sysstr(v) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
26 return pycompat.sysstr(stringutil.pprint(v)) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
27 |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
28 def bprint(*args, **kwargs): |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
29 print(*[_maybesysstr(a) for a in args], |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
30 **{k: _maybesysstr(v) for k, v in kwargs.items()}) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
31 # avoid awkward interleaving with ui object's output |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
32 sys.stdout.flush() |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
33 |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
34 def testui(user=b'foo', group=b'bar', tusers=(), tgroups=(), |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
35 cuser=b'foo', cgroup=b'bar', debug=False, silent=False, |
13493
95b0d4c1c9e1
ui: always report untrusted hgrc files when debug enabled
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
11291
diff
changeset
|
36 report=True): |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
37 # user, group => owners of the file |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
38 # tusers, tgroups => trusted users/groups |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
39 # cuser, cgroup => user/group of the current process |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
40 |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
41 # write a global hgrc with the list of trusted users/groups and |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
42 # some setting so that we can be sure it was read |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
43 f = open(hgrc, 'wb') |
5523
5db730475d6d
tests/*: avoid losing the original settings from $HGRCPATH
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4516
diff
changeset
|
44 f.write(basehgrc) |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
45 f.write(b'\n[paths]\n') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
46 f.write(b'global = /some/path\n\n') |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
47 |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
48 if tusers or tgroups: |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
49 f.write(b'[trusted]\n') |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
50 if tusers: |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
51 f.write(b'users = %s\n' % b', '.join(tusers)) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
52 if tgroups: |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
53 f.write(b'groups = %s\n' % b', '.join(tgroups)) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
54 f.close() |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
55 |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
56 # override the functions that give names to uids and gids |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
57 def username(uid=None): |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
58 if uid is None: |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
59 return cuser |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
60 return user |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
61 util.username = username |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
62 |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
63 def groupname(gid=None): |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
64 if gid is None: |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
65 return b'bar' |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
66 return group |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
67 util.groupname = groupname |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
68 |
8657
3fa92c618624
posix: do not use fstat in isowner
Martin Geisler <mg@lazybytes.net>
parents:
8190
diff
changeset
|
69 def isowner(st): |
3677
1a0fa3914c46
Avoid looking up usernames if the current user owns the .hgrc file
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3552
diff
changeset
|
70 return user == cuser |
1a0fa3914c46
Avoid looking up usernames if the current user owns the .hgrc file
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3552
diff
changeset
|
71 util.isowner = isowner |
1a0fa3914c46
Avoid looking up usernames if the current user owns the .hgrc file
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3552
diff
changeset
|
72 |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
73 # try to read everything |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
74 #print '# File belongs to user %s, group %s' % (user, group) |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
75 #print '# trusted users = %s; trusted groups = %s' % (tusers, tgroups) |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
76 kind = (b'different', b'same') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
77 who = (b'', b'user', b'group', b'user and the group') |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
78 trusted = who[(user in tusers) + 2*(group in tgroups)] |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
79 if trusted: |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
80 trusted = b', but we trust the ' + trusted |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
81 bprint(b'# %s user, %s group%s' % (kind[user == cuser], |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
82 kind[group == cgroup], |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
83 trusted)) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
84 |
30559
d83ca854fa21
ui: factor out ui.load() to create a ui without loading configs (API)
Yuya Nishihara <yuya@tcha.org>
parents:
28934
diff
changeset
|
85 u = uimod.ui.load() |
34858
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
86 # disable the configuration registration warning |
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
87 # |
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
88 # the purpose of this test is to check the old behavior, not to validate the |
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
89 # behavior from registered item. so we silent warning related to unregisted |
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
90 # config. |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
91 u.setconfig(b'devel', b'warn-config-unknown', False, b'test') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
92 u.setconfig(b'devel', b'all-warnings', False, b'test') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
93 u.setconfig(b'ui', b'debug', pycompat.bytestr(bool(debug))) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
94 u.setconfig(b'ui', b'report_untrusted', pycompat.bytestr(bool(report))) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
95 u.readconfig(b'.hg/hgrc') |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
96 if silent: |
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
97 return u |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
98 bprint(b'trusted') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
99 for name, path in u.configitems(b'paths'): |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
100 bprint(b' ', name, b'=', util.pconvert(path)) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
101 bprint(b'untrusted') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
102 for name, path in u.configitems(b'paths', untrusted=True): |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
103 bprint(b'.', end=b' ') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
104 u.config(b'paths', name) # warning with debug=True |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
105 bprint(b'.', end=b' ') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
106 u.config(b'paths', name, untrusted=True) # no warnings |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
107 bprint(name, b'=', util.pconvert(path)) |
28934
c4040a35b5d9
tests: make test-trusted use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28913
diff
changeset
|
108 print() |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
109 |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
110 return u |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
111 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
112 os.mkdir(b'repo') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
113 os.chdir(b'repo') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
114 os.mkdir(b'.hg') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
115 f = open(b'.hg/hgrc', 'wb') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
116 f.write(b'[paths]\n') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
117 f.write(b'local = /another/path\n\n') |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
118 f.close() |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
119 |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
120 #print '# Everything is run by user foo, group bar\n' |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
121 |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
122 # same user, same group |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
123 testui() |
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
124 # same user, different group |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
125 testui(group=b'def') |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
126 # different user, same group |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
127 testui(user=b'abc') |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
128 # ... but we trust the group |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
129 testui(user=b'abc', tgroups=[b'bar']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
130 # different user, different group |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
131 testui(user=b'abc', group=b'def') |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
132 # ... but we trust the user |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
133 testui(user=b'abc', group=b'def', tusers=[b'abc']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
134 # ... but we trust the group |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
135 testui(user=b'abc', group=b'def', tgroups=[b'def']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
136 # ... but we trust the user and the group |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
137 testui(user=b'abc', group=b'def', tusers=[b'abc'], tgroups=[b'def']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
138 # ... but we trust all users |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
139 bprint(b'# we trust all users') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
140 testui(user=b'abc', group=b'def', tusers=[b'*']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
141 # ... but we trust all groups |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
142 bprint(b'# we trust all groups') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
143 testui(user=b'abc', group=b'def', tgroups=[b'*']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
144 # ... but we trust the whole universe |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
145 bprint(b'# we trust all users and groups') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
146 testui(user=b'abc', group=b'def', tusers=[b'*'], tgroups=[b'*']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
147 # ... check that users and groups are in different namespaces |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
148 bprint(b"# we don't get confused by users and groups with the same name") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
149 testui(user=b'abc', group=b'def', tusers=[b'def'], tgroups=[b'abc']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
150 # ... lists of user names work |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
151 bprint(b"# list of user names") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
152 testui(user=b'abc', group=b'def', tusers=[b'foo', b'xyz', b'abc', b'bleh'], |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
153 tgroups=[b'bar', b'baz', b'qux']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
154 # ... lists of group names work |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
155 bprint(b"# list of group names") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
156 testui(user=b'abc', group=b'def', tusers=[b'foo', b'xyz', b'bleh'], |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
157 tgroups=[b'bar', b'def', b'baz', b'qux']) |
3551
3b07e223534b
Only read .hg/hgrc files from trusted users/groups
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
158 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
159 bprint(b"# Can't figure out the name of the user running this process") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
160 testui(user=b'abc', group=b'def', cuser=None) |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
161 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
162 bprint(b"# prints debug warnings") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
163 u = testui(user=b'abc', group=b'def', cuser=b'foo', debug=True) |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
164 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
165 bprint(b"# report_untrusted enabled without debug hides warnings") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
166 u = testui(user=b'abc', group=b'def', cuser=b'foo', report=False) |
13493
95b0d4c1c9e1
ui: always report untrusted hgrc files when debug enabled
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
11291
diff
changeset
|
167 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
168 bprint(b"# report_untrusted enabled with debug shows warnings") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
169 u = testui(user=b'abc', group=b'def', cuser=b'foo', debug=True, report=False) |
13493
95b0d4c1c9e1
ui: always report untrusted hgrc files when debug enabled
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
11291
diff
changeset
|
170 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
171 bprint(b"# ui.readconfig sections") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
172 filename = b'foobar' |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
173 f = open(filename, 'wb') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
174 f.write(b'[foobar]\n') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
175 f.write(b'baz = quux\n') |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
176 f.close() |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
177 u.readconfig(filename, sections=[b'foobar']) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
178 bprint(u.config(b'foobar', b'baz')) |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
179 |
28934
c4040a35b5d9
tests: make test-trusted use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28913
diff
changeset
|
180 print() |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
181 bprint(b"# read trusted, untrusted, new ui, trusted") |
30559
d83ca854fa21
ui: factor out ui.load() to create a ui without loading configs (API)
Yuya Nishihara <yuya@tcha.org>
parents:
28934
diff
changeset
|
182 u = uimod.ui.load() |
34858
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
183 # disable the configuration registration warning |
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
184 # |
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
185 # the purpose of this test is to check the old behavior, not to validate the |
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
186 # behavior from registered item. so we silent warning related to unregisted |
85a2db47ad50
configitems: adds a developer warning when accessing undeclared configuration
Boris Feld <boris.feld@octobus.net>
parents:
31857
diff
changeset
|
187 # config. |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
188 u.setconfig(b'devel', b'warn-config-unknown', False, b'test') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
189 u.setconfig(b'devel', b'all-warnings', False, b'test') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
190 u.setconfig(b'ui', b'debug', b'on') |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
191 u.readconfig(filename) |
8190
9b8ac5fb7760
ui: kill most users of parentui name and arg, replace with .copy()
Matt Mackall <mpm@selenic.com>
parents:
8144
diff
changeset
|
192 u2 = u.copy() |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
193 def username(uid=None): |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
194 return b'foo' |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
195 util.username = username |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
196 u2.readconfig(b'.hg/hgrc') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
197 bprint(b'trusted:') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
198 bprint(u2.config(b'foobar', b'baz')) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
199 bprint(b'untrusted:') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
200 bprint(u2.config(b'foobar', b'baz', untrusted=True)) |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
201 |
28934
c4040a35b5d9
tests: make test-trusted use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28913
diff
changeset
|
202 print() |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
203 bprint(b"# error handling") |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
204 |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25660
diff
changeset
|
205 def assertraises(f, exc=error.Abort): |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
206 try: |
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
207 f() |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
19872
diff
changeset
|
208 except exc as inst: |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
209 bprint(b'raised', inst.__class__.__name__) |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
210 else: |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
211 bprint(b'no exception?!') |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
212 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
213 bprint(b"# file doesn't exist") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
214 os.unlink(b'.hg/hgrc') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
215 assert not os.path.exists(b'.hg/hgrc') |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
216 testui(debug=True, silent=True) |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
217 testui(user=b'abc', group=b'def', debug=True, silent=True) |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
218 |
28934
c4040a35b5d9
tests: make test-trusted use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28913
diff
changeset
|
219 print() |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
220 bprint(b"# parse error") |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
221 f = open(b'.hg/hgrc', 'wb') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
222 f.write(b'foo') |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
223 f.close() |
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
224 |
41497
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
225 # This is a hack to remove b'' prefixes from ParseError.__bytes__ on |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
226 # Python 3. |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
227 def normalizeparseerror(e): |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
228 if pycompat.ispy3: |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
229 args = [a.decode('utf-8') for a in e.args] |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
230 else: |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
231 args = e.args |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
232 |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
233 return error.ParseError(*args) |
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
234 |
8144
fca54469480e
ui: introduce new config parser
Matt Mackall <mpm@selenic.com>
parents:
8142
diff
changeset
|
235 try: |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
236 testui(user=b'abc', group=b'def', silent=True) |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
19872
diff
changeset
|
237 except error.ParseError as inst: |
41497
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
238 bprint(normalizeparseerror(inst)) |
3552
9b52239dc740
save settings from untrusted config files in a separate configparser
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3551
diff
changeset
|
239 |
8144
fca54469480e
ui: introduce new config parser
Matt Mackall <mpm@selenic.com>
parents:
8142
diff
changeset
|
240 try: |
fca54469480e
ui: introduce new config parser
Matt Mackall <mpm@selenic.com>
parents:
8142
diff
changeset
|
241 testui(debug=True, silent=True) |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
19872
diff
changeset
|
242 except error.ParseError as inst: |
41497
3028b4073be1
tests: convert ParseError arguments to str on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41352
diff
changeset
|
243 bprint(normalizeparseerror(inst)) |
31472
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
244 |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
245 print() |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
246 bprint(b'# access typed information') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
247 with open(b'.hg/hgrc', 'wb') as f: |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
248 f.write(b'''\ |
31472
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
249 [foo] |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
250 sub=main |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
251 sub:one=one |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
252 sub:two=two |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
253 path=monty/python |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
254 bool=true |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
255 int=42 |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
256 bytes=81mb |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
257 list=spam,ham,eggs |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
258 ''') |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
259 u = testui(user=b'abc', group=b'def', cuser=b'foo', silent=True) |
31857
08fbc97d1364
tests: print Unix style paths in *.py tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
31472
diff
changeset
|
260 def configpath(section, name, default=None, untrusted=False): |
08fbc97d1364
tests: print Unix style paths in *.py tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
31472
diff
changeset
|
261 path = u.configpath(section, name, default, untrusted) |
08fbc97d1364
tests: print Unix style paths in *.py tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
31472
diff
changeset
|
262 if path is None: |
08fbc97d1364
tests: print Unix style paths in *.py tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
31472
diff
changeset
|
263 return None |
08fbc97d1364
tests: print Unix style paths in *.py tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
31472
diff
changeset
|
264 return util.pconvert(path) |
08fbc97d1364
tests: print Unix style paths in *.py tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
31472
diff
changeset
|
265 |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
266 bprint(b'# suboptions, trusted and untrusted') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
267 trusted = u.configsuboptions(b'foo', b'sub') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
268 untrusted = u.configsuboptions(b'foo', b'sub', untrusted=True) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
269 bprint( |
31472
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
270 (trusted[0], sorted(trusted[1].items())), |
75e4bae56068
config: honour the trusted flag in ui.configbytes
Martijn Pieters <mjpieters@fb.com>
parents:
30559
diff
changeset
|
271 (untrusted[0], sorted(untrusted[1].items()))) |
41352
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
272 bprint(b'# path, trusted and untrusted') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
273 bprint(configpath(b'foo', b'path'), configpath(b'foo', b'path', untrusted=True)) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
274 bprint(b'# bool, trusted and untrusted') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
275 bprint(u.configbool(b'foo', b'bool'), |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
276 u.configbool(b'foo', b'bool', untrusted=True)) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
277 bprint(b'# int, trusted and untrusted') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
278 bprint( |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
279 u.configint(b'foo', b'int', 0), |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
280 u.configint(b'foo', b'int', 0, untrusted=True)) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
281 bprint(b'# bytes, trusted and untrusted') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
282 bprint( |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
283 u.configbytes(b'foo', b'bytes', 0), |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
284 u.configbytes(b'foo', b'bytes', 0, untrusted=True)) |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
285 bprint(b'# list, trusted and untrusted') |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
286 bprint( |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
287 u.configlist(b'foo', b'list', []), |
73ccba60aaa1
py3: almost fix test-trusted.py
Augie Fackler <augie@google.com>
parents:
34858
diff
changeset
|
288 u.configlist(b'foo', b'list', [], untrusted=True)) |