Skip to content

Commit eb0043a

Browse files
authored
Enable UI tests on dev branch again (#2353)
They might be more stable now after the term changes. Ref #1647
1 parent d9b3e17 commit eb0043a

File tree

2 files changed

+1
-30
lines changed

2 files changed

+1
-30
lines changed

docs/source/conf.py

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ def __setattr__(self, name, value):
9797
github_actions = os.environ.get('USER') == 'runner'
9898
travis_ci = os.environ.get('USER') == 'travis'
9999
local_doctest = os.environ.get('USER') == 'pwntools'
100-
branch_dev = os.environ.get('GITHUB_BASE_REF') == 'dev'
101100
skip_android = True
102101
'''
103102

pwnlib/ui.py

+1-29
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ def yesno(prompt, default=None):
6161
`True` if the answer was "yes", `False` if "no"
6262
6363
Examples:
64-
65-
.. doctest::
66-
:skipif: branch_dev
67-
6864
>>> yesno("A number:", 20)
6965
Traceback (most recent call last):
7066
...
@@ -83,10 +79,6 @@ def yesno(prompt, default=None):
8379
[?] is it good 3 [yes/No] False
8480
8581
Tests:
86-
87-
.. doctest::
88-
:skipif: branch_dev
89-
9082
>>> p = testpwnproc("print(yesno('is it ok??'))")
9183
>>> b"is it ok" in p.recvuntil(b"??")
9284
True
@@ -148,20 +140,12 @@ def options(prompt, opts, default = None):
148140
The users choice in the form of an integer.
149141
150142
Examples:
151-
152-
.. doctest::
153-
:skipif: branch_dev
154-
155143
>>> options("Select a color", ("red", "green", "blue"), "green")
156144
Traceback (most recent call last):
157145
...
158146
ValueError: options(): default must be a number or None
159147
160148
Tests:
161-
162-
.. doctest::
163-
:skipif: branch_dev
164-
165149
>>> p = testpwnproc("print(options('select a color', ('red', 'green', 'blue')))")
166150
>>> p.sendline(b"\33[C\33[A\33[A\33[B\33[1;5A\33[1;5B 0310")
167151
>>> _ = p.recvall()
@@ -272,10 +256,6 @@ def pause(n=None):
272256
r"""Waits for either user input or a specific number of seconds.
273257
274258
Examples:
275-
276-
.. doctest::
277-
:skipif: branch_dev
278-
279259
>>> with context.local(log_level="INFO"):
280260
... pause(1)
281261
[x] Waiting
@@ -287,10 +267,6 @@ def pause(n=None):
287267
ValueError: pause(): n must be a number or None
288268
289269
Tests:
290-
291-
.. doctest::
292-
:skipif: branch_dev
293-
294270
>>> saved_stdin = sys.stdin
295271
>>> try:
296272
... sys.stdin = io.TextIOWrapper(io.BytesIO(b"\n"))
@@ -335,11 +311,7 @@ def more(text):
335311
Returns:
336312
:const:`None`
337313
338-
Tests:
339-
340-
.. doctest::
341-
:skipif: branch_dev
342-
314+
Tests:
343315
>>> more("text")
344316
text
345317
>>> p = testpwnproc("more('text\\n' * (term.height + 2))")

0 commit comments

Comments
 (0)