Skip to content
This repository has been archived by the owner on Jan 26, 2025. It is now read-only.

Commit

Permalink
fix some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
kmpm committed Dec 15, 2019
1 parent f3c736c commit 3ca58bd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion nodemcu_uploader/luacode.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
if l >= 0 then fd:write(d:sub(3, l+2)); end
if l == 0 then fd:close(); w(0, ack); return on('data') else w(0, ack) end
end
local function recv_name(d) d = d:gsub('%z.*', '') file.remove(d) fd=file.open(d, 'w') on('data', 130, recv_block, 0) w(0, ack) end
local function recv_name(d) d = d:gsub('%z.*', '') d:sub(1,-2) file.remove(d) fd=file.open(d, 'w') on('data', 130, recv_block, 0) w(0, ack) end
on('data', '\0', recv_name, 0)
w(0, 'C')
end
Expand Down
12 changes: 6 additions & 6 deletions tests/misc.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2015-2019 Peter Magnusson <[email protected]>
import unittest
from nodemcu_uploader.utils import default_port
from nodemcu_uploader.serialutils import default_port
from nodemcu_uploader import __version__
import os

Expand All @@ -19,9 +19,9 @@ def test_default_port(self):
self.assertEqual(default_port(), os.environ['SERIALPORT'])
else:
# Test as if it were given system
self.assertEqual(default_port('Linux'), '/dev/ttyUSB0')
self.assertEqual(default_port('Windows'), 'COM1')
self.assertEqual(default_port('Darwin'), '/dev/tty.SLAB_USBtoUART')
self.assertEqual(default_port('Linux', False), '/dev/ttyUSB0')
self.assertEqual(default_port('Windows', False), 'COM1')
self.assertEqual(default_port('Darwin', False), '/dev/tty.SLAB_USBtoUART')

def test_remote_path_validation(self):
validate.remotePath("test/something/maximum/len.jpeg")
Expand All @@ -30,5 +30,5 @@ def test_remote_path_validation(self):
def v(p):
validate.remotePath(p)

self.assertRaises(exceptions.PathLengthException, (lambda: v("test/something/maximum/leng.jpeg")))
self.assertRaises(exceptions.PathLengthException, (lambda: v("")))
self.assertRaises(exceptions.ValidationException, (lambda: v("test/something/maximum/leng.jpeg")))
self.assertRaises(exceptions.ValidationException, (lambda: v("")))

0 comments on commit 3ca58bd

Please sign in to comment.