Skip to content

Commit be76e6c

Browse files
rename micropython modbus file to myp_unittest to avoid import conflicts during documentation build process
1 parent 68150e2 commit be76e6c

8 files changed

+8
-8
lines changed

Dockerfile.test_tcp_example

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FROM micropython/unix:v1.18
1010
# use "volumes" in docker-compose file to remove need of rebuilding
1111
# COPY ./ /home
1212
# COPY umodbus /root/.micropython/lib/umodbus
13-
# COPY unittest.py /root/.micropython/lib/unittest.py
13+
# COPY mpy_unittest.py /root/.micropython/lib/mpy_unittest.py
1414

1515
RUN micropython-dev -m upip install micropython-ulogging
1616
RUN micropython-dev -m upip install micropython-urequests

Dockerfile.tests

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ COPY ./ /home
1111
# keep examples and tests registers JSON file easily in sync
1212
COPY registers/example.json /home/tests/test-registers.json
1313
COPY umodbus /root/.micropython/lib/umodbus
14-
COPY unittest.py /root/.micropython/lib/unittest.py
14+
COPY mpy_unittest.py /root/.micropython/lib/mpy_unittest.py
1515

1616
RUN micropython-dev -m upip install micropython-ulogging
1717
RUN micropython-dev -m upip install micropython-urequests
18-
RUN micropython-dev -c "import unittest; unittest.main('tests')"
18+
RUN micropython-dev -c "import mpy_unittest as unittest; unittest.main('tests')"
1919

2020
ENTRYPOINT ["/bin/bash"]

docker-compose-tcp-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ services:
3535
volumes:
3636
- ./:/home
3737
- ./umodbus:/root/.micropython/lib/umodbus
38-
- ./unittest.py:/root/.micropython/lib/unittest.py
38+
- ./mpy_unittest.py:/root/.micropython/lib/mpy_unittest.py
3939
depends_on:
4040
- micropython-client
4141
command:
File renamed without changes.

tests/test_absolute_truth.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# import sys
66
import ulogging as logging
7-
import unittest
7+
import mpy_unittest as unittest
88

99

1010
class TestAbsoluteTruth(unittest.TestCase):

tests/test_const.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from umodbus.typing import List
66
import ulogging as logging
7-
import unittest
7+
import mpy_unittest as unittest
88
from umodbus import const as Const
99

1010

tests/test_functions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"""Unittest for testing functions of umodbus"""
44

55
import ulogging as logging
6-
import unittest
6+
import mpy_unittest as unittest
77
from umodbus import functions
88
from umodbus import const as Const
99

tests/test_tcp_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from random import randint
77
import struct
88
import ulogging as logging
9-
import unittest
9+
import mpy_unittest as unittest
1010
from umodbus.tcp import TCP as ModbusTCPMaster
1111

1212

0 commit comments

Comments
 (0)