Skip to content

Commit

Permalink
Moves tests into "tests" directory. Fixed imports where necessary. Up…
Browse files Browse the repository at this point in the history
…dated MANIFEST
  • Loading branch information
Apple, Christopher committed Sep 29, 2017
1 parent a97a130 commit 1b67581
Show file tree
Hide file tree
Showing 18 changed files with 32 additions and 32 deletions.
3 changes: 2 additions & 1 deletion MANIFEST.in
@@ -1,4 +1,5 @@
include README.rst LICENSE run_tests.py tox.ini
include README.rst LICENSE tox.ini
recursive-include tests *.py
recursive-include examples *.py
recursive-include extras *.py
include docs/_static/PLACEHOLDER
Expand Down
@@ -1,4 +1,4 @@
from .backend import Backend
from mido.backends.backend import Backend


def test_split_api():
Expand Down
@@ -1,4 +1,4 @@
from .rtmidi_utils import expand_alsa_port_name
from mido.backends.rtmidi_utils import expand_alsa_port_name


def test_expand_alsa_port_name():
Expand Down
@@ -1,6 +1,6 @@
from pytest import raises
from .checks import check_time
from ..py2 import PY2
from mido.messages.checks import check_time
from mido.py2 import PY2


def test_check_time():
Expand Down
@@ -1,5 +1,5 @@
from pytest import raises
from .decode import decode_message
from mido.messages.decode import decode_message


def sysex(data):
Expand Down
@@ -1,4 +1,4 @@
from .decode import Decoder
from mido.messages.decode import Decoder

NOTE_ON = dict(type='note_on', note=1, velocity=2, channel=0, time=0)
SYSEX = dict(type='sysex', data=(1, 2, 3), time=0)
Expand Down
@@ -1,6 +1,6 @@
from .specs import SPEC_BY_STATUS
from .encode import encode_message
from .decode import decode_message
from mido.messages.specs import SPEC_BY_STATUS
from mido.messages.encode import encode_message
from mido.messages.decode import decode_message


def test_encode_decode_all():
Expand Down
@@ -1,6 +1,6 @@
from pytest import raises
from .specs import MIN_PITCHWHEEL, MAX_PITCHWHEEL, MIN_SONGPOS, MAX_SONGPOS
from .messages import Message, SysexData
from mido.messages.specs import MIN_PITCHWHEEL, MAX_PITCHWHEEL, MIN_SONGPOS, MAX_SONGPOS
from mido.messages.messages import Message, SysexData


def test_msg_time_equality():
Expand Down
@@ -1,5 +1,5 @@
from pytest import raises
from .messages import Message
from mido.messages import Message


def test_decode_sysex():
Expand Down
@@ -1,5 +1,5 @@
import pytest
from .meta import MetaMessage, MetaSpec_key_signature, KeySignatureError
from mido.midifiles.meta import MetaMessage, MetaSpec_key_signature, KeySignatureError


def test_copy_invalid_argument():
Expand Down
@@ -1,8 +1,8 @@
import io
from pytest import raises
from ..messages import Message
from .midifiles import MidiFile
from .meta import MetaMessage, KeySignatureError
from mido.messages import Message
from mido.midifiles.midifiles import MidiFile
from mido.midifiles.meta import MetaMessage, KeySignatureError

HEADER_ONE_TRACK = """
4d 54 68 64 # MThd
Expand Down
@@ -1,5 +1,5 @@
from .meta import MetaMessage
from .tracks import MidiTrack
from mido.midifiles.meta import MetaMessage
from mido.midifiles.tracks import MidiTrack


def test_track_slice():
Expand Down
@@ -1,4 +1,4 @@
from .units import tempo2bpm, bpm2tempo, tick2second, second2tick
from mido.midifiles.units import tempo2bpm, bpm2tempo, tick2second, second2tick


def test_tempo2bpm_bpm2tempo():
Expand Down
8 changes: 4 additions & 4 deletions mido/test_frozen.py → tests/test_frozen.py
@@ -1,7 +1,7 @@
from .messages import Message
from .frozen import (is_frozen, freeze_message, thaw_message,
FrozenMessage, FrozenMetaMessage,
FrozenUnknownMetaMessage)
from mido.messages import Message
from mido.frozen import (is_frozen, freeze_message, thaw_message,
FrozenMessage, FrozenMetaMessage,
FrozenUnknownMetaMessage)


def test_hashability():
Expand Down
5 changes: 2 additions & 3 deletions mido/test_parser.py → tests/test_parser.py
Expand Up @@ -2,8 +2,8 @@
import random
from pytest import raises

from .messages import Message
from .parser import Parser, parse, parse_all
from mido.messages import Message, specs
from mido.parser import Parser, parse, parse_all


def test_parse():
Expand Down Expand Up @@ -115,7 +115,6 @@ def test_encode_and_parse_all():
This checks mostly for errors in the parser.
"""
from .messages import specs

parser = Parser()
for type_ in sorted(specs.SPEC_BY_TYPE.keys()):
Expand Down
4 changes: 2 additions & 2 deletions mido/test_ports.py → tests/test_ports.py
@@ -1,6 +1,6 @@
import pytest
from .messages import Message
from .ports import BaseIOPort
from mido.messages import Message
from mido.ports import BaseIOPort


class TestIOPort:
Expand Down
2 changes: 1 addition & 1 deletion mido/test_sockets.py → tests/test_sockets.py
@@ -1,5 +1,5 @@
import pytest
from .sockets import parse_address
from mido.sockets import parse_address


class TestParseAddress:
Expand Down
4 changes: 2 additions & 2 deletions mido/test_syx.py → tests/test_syx.py
@@ -1,6 +1,6 @@
from pytest import raises
from .messages import Message
from .syx import read_syx_file, write_syx_file
from mido.messages import Message
from mido.syx import read_syx_file, write_syx_file


def test_read(tmpdir):
Expand Down

0 comments on commit 1b67581

Please sign in to comment.