Skip to content

Commit

Permalink
Fixed tox.ini versions and some other things
Browse files Browse the repository at this point in the history
  • Loading branch information
MicroTransactionsMatterToo committed Aug 28, 2017
1 parent bf4b910 commit 368821a
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 16 deletions.
3 changes: 0 additions & 3 deletions tests/test_events.py
Expand Up @@ -19,7 +19,6 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import nose2
import logging
from unittest import TestCase, TestSuite
from unittest.mock import MagicMock, call
Expand Down Expand Up @@ -99,5 +98,3 @@ def test_constructor(self):
self.assertEqual(vars(obj), match_val, "When testing constructor of NoteOn with channel value: {}, "
"parsing failed".format(channel >> 16))

if __name__ == "__main__":
nose2.main()
2 changes: 0 additions & 2 deletions tests/test_intbuilder.py
Expand Up @@ -131,5 +131,3 @@ def test_init(self):
})


if __name__ == "__main__":
unittest.main()
4 changes: 0 additions & 4 deletions tests/test_track.py
Expand Up @@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

import nose2
import logging
from unittest import TestCase

Expand All @@ -34,6 +33,3 @@ class TestTrack(TestCase):
def setUp(self):
self.track_inst = Track()


if __name__ == "__main__":
nose2.main()
4 changes: 0 additions & 4 deletions tests/test_vlv.py
Expand Up @@ -19,7 +19,6 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import nose2
import logging
from unittest import TestCase
from unittest.mock import MagicMock, call
Expand Down Expand Up @@ -63,6 +62,3 @@ def test_single_byte_vlv(self):
self.assertEqual(vlv_instance.length, 1, "VLV Incorrect length when reading single byte")
self.mock_file.read.assert_has_calls([call(1)], "VLV Incorrect calls when reading from single byte")


if __name__ == "__main__":
nose2.main()
6 changes: 3 additions & 3 deletions tox.ini
@@ -1,8 +1,8 @@
[tox]
envlist = py30, py31, py33, py34, py35, py36, py37
envlist = py33, py34, py35, py36, py37


[testenv]
deps = nose2
deps = nose
commands =
nose2
nosetests

0 comments on commit 368821a

Please sign in to comment.