From 3ca58bda2f5eda1d6d3fe6271ffedcb4f2358442 Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 15 Dec 2019 20:38:26 +0100 Subject: [PATCH] fix some tests --- nodemcu_uploader/luacode.py | 2 +- tests/misc.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nodemcu_uploader/luacode.py b/nodemcu_uploader/luacode.py index 3439af2..0acdbc3 100644 --- a/nodemcu_uploader/luacode.py +++ b/nodemcu_uploader/luacode.py @@ -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 diff --git a/tests/misc.py b/tests/misc.py index f1417fb..3b36543 100644 --- a/tests/misc.py +++ b/tests/misc.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2015-2019 Peter Magnusson import unittest -from nodemcu_uploader.utils import default_port +from nodemcu_uploader.serialutils import default_port from nodemcu_uploader import __version__ import os @@ -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") @@ -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("")))