Tests: fixing tests interrupt in terminal.

KeyboardInterrupt re-raised.
This commit is contained in:
Max Romanov
2020-11-16 20:37:01 +03:00
parent 6d2b60ff3e
commit 567f0a7b30
10 changed files with 52 additions and 9 deletions

View File

@@ -34,10 +34,16 @@ class TestApplicationGo(TestApplicationProto):
option.test_dir + '/go/' + script + '/' + name + '.go',
]
if option.detailed:
print("\n$ GOPATH=" + env['GOPATH'] + " " + " ".join(args))
try:
process = subprocess.Popen(args, env=env)
process.communicate()
except KeyboardInterrupt:
raise
except:
return None

View File

@@ -71,12 +71,18 @@ class TestApplicationJava(TestApplicationProto):
]
javac.extend(src)
if option.detailed:
print("\n$ " + " ".join(javac))
try:
process = subprocess.Popen(javac, stderr=subprocess.STDOUT)
process.communicate()
except KeyboardInterrupt:
raise
except:
pytest.fail('Cann\'t run javac process.')
pytest.fail('Can\'t run javac process.')
def load(self, script, **kwargs):
self.prepare_env(script)

View File

@@ -25,5 +25,8 @@ def check_go(current_dir, temp_dir, test_dir):
if process.returncode == 0:
return True
except KeyboardInterrupt:
raise
except:
return None

View File

@@ -187,6 +187,10 @@ class TestHTTP(TestUnit):
try:
part = sock.recv(buff_size)
except KeyboardInterrupt:
raise
except:
break
@@ -242,7 +246,8 @@ class TestHTTP(TestUnit):
try:
last_size = int(chunks[-2], 16)
except:
except ValueError:
pytest.fail('Invalid zero size chunk')
if last_size != 0 or chunks[-1] != b'':
@@ -252,7 +257,8 @@ class TestHTTP(TestUnit):
while len(chunks) >= 2:
try:
size = int(chunks.pop(0), 16)
except:
except ValueError:
pytest.fail('Invalid chunk size %s' % str(size))
if size == 0: