Skip to content

Fix tests on Numpy 1.4 and Python 3.x #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astrofrog merged 1 commit into from
Dec 4, 2012
Merged

Fix tests on Numpy 1.4 and Python 3.x #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion astropy/io/votable/tests/table_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import numpy as np
from ....tests.helper import pytest

from ....utils.data import get_pkg_data_filename
from ....utils.data import get_pkg_data_filename, get_pkg_data_fileobj
from ..table import parse, writeto
from .. import tree

Expand Down Expand Up @@ -79,3 +79,31 @@ def test_table():
assert field.arraysize == d['arraysize']

writeto(votable2, os.path.join(TMP_DIR, "through_table.xml"))


@pytest.mark.xfail('numpy_lt_1p5')
def test_read_through_table_interface():
from ....table import Table

with get_pkg_data_fileobj('data/regression.xml', encoding='binary') as fd:
t = Table.read(fd, format='votable', table_id='main_table')

assert len(t) == 5

fn = os.path.join(TMP_DIR, "table_interface.xml")
t.write(fn, table_id='FOO', format='votable')

with open(fn, 'rb') as fd:
t2 = Table.read(fd, format='votable', table_id='FOO')

assert len(t2) == 5


@pytest.mark.xfail('numpy_lt_1p5')
def test_read_through_table_interface2():
from ....table import Table

with get_pkg_data_fileobj('data/regression.xml', encoding='binary') as fd:
t = Table.read(fd, format='votable', table_id='last_table')

assert len(t) == 0
26 changes: 0 additions & 26 deletions astropy/io/votable/tests/vo_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,29 +804,3 @@ def test_fileobj():
assert isinstance(fd, io.FileIO)
else:
assert isinstance(fd, file)


def test_read_through_table_interface():
from ....table import Table

with get_pkg_data_fileobj('data/regression.xml') as fd:
t = Table.read(fd, format='votable', table_id='main_table')

assert len(t) == 5

fn = join(TMP_DIR, "table_interface.xml")
t.write(fn, table_id='FOO', format='votable')

with open(fn) as fd:
t2 = Table.read(fd, format='votable', table_id='FOO')

assert len(t2) == 5


def test_read_through_table_interface2():
from ....table import Table

with get_pkg_data_fileobj('data/regression.xml') as fd:
t = Table.read(fd, format='votable', table_id='last_table')

assert len(t) == 0