Philipp Hörist pushed to branch master at gajim / gajim
Commits:
06b8eb58 by André Apitzsch at 2018-01-17T22:36:14+01:00
Fix tests
- - - - -
1605b722 by Philipp Hörist at 2018-01-19T00:33:43+01:00
Merge branch 'fixTest' into 'master'
Fix tests
See merge request gajim/gajim!192
- - - - -
2 changed files:
- gajim/common/caps_cache.py
- setup.py
Changes:
=====================================
gajim/common/caps_cache.py
=====================================
--- a/gajim/common/caps_cache.py
+++ b/gajim/common/caps_cache.py
@@ -46,7 +46,7 @@ from nbxmpp import (NS_XHTML_IM, NS_ESESSION, NS_CHATSTATES,
FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_ESESSION,
NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO,
NS_JINGLE_FILE_TRANSFER_5]
-from gajim.common import app
+
# Query entry status codes
NEW = 0
QUERIED = 1
@@ -457,6 +457,7 @@ class MucCapsCache:
identities, features, data = [], [], []
query_childs = stanza.getQueryChildren()
if not query_childs:
+ from gajim.common import app
app.log('gajim.muc').warning('%s returned empty disco info', jid)
return
=====================================
setup.py
=====================================
--- a/setup.py
+++ b/setup.py
@@ -14,6 +14,8 @@ from setuptools.command.build_py import build_py as _build
from distutils import log
from distutils.util import convert_path, newer
+import subprocess
+
import gajim
pos = [x for x in os.listdir('po') if x[-3:] == ".po"]
@@ -179,14 +181,14 @@ class test(Command):
pass
def run(self):
- os.system("./test/runtests.py")
+ exit(subprocess.call("./test/runtests.py"))
class test_nogui(test):
description = "Run tests without GUI"
def run(self):
- os.system("./test/runtests.py -n")
+ exit(subprocess.call(["./test/runtests.py", "-n"]))
class update_po(Command):
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/12e534d02fea40df73a695f996586e39e29f0f4d...1605b722b71bd3e126396e4a9e15bae1dcdfc7ac
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/12e534d02fea40df73a695f996586e39e29f0f4d...1605b722b71bd3e126396e4a9e15bae1dcdfc7ac
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
