Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable all tests, except those to be rewritten/excluded

Browse Source
This commit is contained in:
Doug Blank 2015-03-18 03:57:27 -04:00
parent ad1d47cc37
commit 35dead7b26
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -26,4 +26,4 @@ install:
script: script:
- mkdir -p /home/travis/.gramps/grampsdb/ - mkdir -p /home/travis/.gramps/grampsdb/
- DJANGO_SETTINGS_MODULE=gramps.webapp.settings nosetests3 --exclude=TestcaseGenerator --exclude=exportvcard_test --exclude=vcard --exclude=merge_ref_test --exclude=test2_exec_CLI --exclude=test3_files_in_import_dir --exclude=test_manual_run gramps - DJANGO_SETTINGS_MODULE=gramps.webapp.settings nosetests3 --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test gramps

4
gramps/cli/test/cli_test.py
View File

@ -75,7 +75,7 @@ class Test(unittest.TestCase):
ifile = min1r ifile = min1r
ofile = out_ged ofile = out_ged
gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile) gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile)
process = subprocess.Popen("python %s" % gcmd, process = subprocess.Popen("python3 %s" % gcmd,
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=True) stderr=subprocess.PIPE, shell=True)
@ -107,7 +107,7 @@ class Test(unittest.TestCase):
ifile = min1r ifile = min1r
ofile = out_ged ofile = out_ged
gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile) gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile)
process = subprocess.Popen("python %s" % gcmd, process = subprocess.Popen("python3 %s" % gcmd,
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=True) stderr=subprocess.PIPE, shell=True)

10
gramps/plugins/importer/test/importvcard_test.py
View File

@ -29,9 +29,9 @@ import time
import subprocess import subprocess
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from ...lib.libgrampsxml import GRAMPS_XML_VERSION from gramps.plugins.lib.libgrampsxml import GRAMPS_XML_VERSION
from gramps.version import VERSION from gramps.version import VERSION
from ..importvcard import VCardParser, fitin, splitof_nameprefix from gramps.plugins.importer.importvcard import VCardParser, fitin, splitof_nameprefix
class VCardCheck(unittest.TestCase): class VCardCheck(unittest.TestCase):
def setUp(self): def setUp(self):
@ -72,18 +72,18 @@ class VCardCheck(unittest.TestCase):
return ET.tostring(doc, encoding='utf-8') return ET.tostring(doc, encoding='utf-8')
def do_case(self, input_str, expect_doc, debug=False): def do_case(self, input_str, expect_doc, debug=True):
if debug: if debug:
print(input_str) print(input_str)
process = subprocess.Popen('python Gramps.py -d .Date -d .ImportVCard ' process = subprocess.Popen('python3 Gramps.py -d .Date -d .ImportVCard '
'--config=preferences.eprefix:DEFAULT ' '--config=preferences.eprefix:DEFAULT '
'-i - -f vcf -e - -f gramps', '-i - -f vcf -e - -f gramps',
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
shell=True) shell=True)
result_str, err_str = process.communicate(input_str.encode('utf-8')) result_str, err_str = process.communicate(input_str.encode("utf-8"))
if debug: if debug:
print(err_str) print(err_str)
result_doc = ET.XML(result_str) result_doc = ET.XML(result_str)